Author: jsuchome Date: Wed Jul 1 08:47:14 2009 New Revision: 57812 URL: http://svn.opensuse.org/viewcvs/yast?rev=57812&view=rev Log: - updated the help text (bnc#517717) - 2.17.5 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-instal... ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Wed Jul 1 08:47:14 2009 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-instal... ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Wed Jul 1 08:47:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 1 08:38:37 CEST 2009 - jsuchome@suse.cz + +- updated the help text (bnc#517717) +- 2.17.5 + +------------------------------------------------------------------- Tue Jun 30 11:49:04 CEST 2009 - jsuchome@suse.cz - detection script called directly from y2update directory Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-instal... ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp Wed Jul 1 08:47:14 2009 @@ -81,8 +81,15 @@ cont = `HBox (`HSpacing (3), cont, `HSpacing (3)); // help text - string help = _("<p>Enter EITHER nlpos9 migration data, OR SLES11 offline data (whatever it is).... - Or nothing, if you don't understand the request.</p>"); + string help = _("<p>In case you are not migrating from NLPOS9 and this is a new SLEPOS 11 +installation continue by clicking <b>Next</b>.</p>") + + + // help text, cont. + _("<p>To migrate from NLPOS9 insert the backed up archive file or backup directory +into the corresponding input box and continue by clicking <b>Next</b>. +The backup file or directory is prepared beforehand using the script <tt>nlpos9_backup_data.sh</tt> +which can be found on the SLEPOS CD in the directory <tt>/migration/</tt> or in the directory +<tt>/usr/lib/SLEPOS/migration</tt> of <tt>POS_Migration.rpm</tt> package.</p>"); // Dialog caption Wizard::SetContentsButtons (_("Entering Migration Data"), cont, help, Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-instal... ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp Wed Jul 1 08:47:14 2009 @@ -114,7 +114,8 @@ _("POS Data Migration"), cont, // TRANSLATORS: Dialog help - _("<p>FIXME</p>"), + _("<p>The progress bar indicates the separate migration steps. The complete log +of the migration is saved and will be shown in case of migration failure.</p>"), Label::BackButton(), Label::NextButton() ); Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-instal... ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Wed Jul 1 08:47:14 2009 @@ -30,7 +30,6 @@ list <map <string, string> > list_of_patterns = [ $[ // TRANSLATORS: A name of pattern, used as CheckBox label -// "label" : _("Admin Server Installation"), "label" : _("Admin Server"), "name" : "SLEPOS_Server_Admin", "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-host.png", @@ -230,27 +229,13 @@ _("Server Pattern Selection"), cont, -/* FIXME help text podle: - tedy ten dialog je spis pro upresneni toho co uzivatel nechce migrovat a u toho co chce navic se spis pocita ze se doinstaluji jen prislusne patterny + // help text + _("<p>Choose the pattern which you want to install. You may disable the migration +of the relevant deployment (AS, BS or IS).</p>") + + + // help text, cont. + _("<p>The installation will start upon pressing <b>Next</b>.</p>"), -(13:31:59) Petr Ostadal: takze dialog pokryva obe varianty , jen me ted napadlo, ze by bylo zajimave pridat do zavorky oonformaci, zda jde o migraci ci "cistou" instalaci AS, BS ci IS... -(13:32:46) jsuchome: no, co uzivatel zaskrtne, to je jen instalace, to co bylo prednastavene je migrace -(13:33:15) jsuchome: otazka je, kdy by se to dalo vyznacit, jak klikne na next tak ten dialog zmizi -(13:33:25) Petr Ostadal: vypadalo by to treba takto: o Admin Server (migration) - checked -o Branch Server (instalation) - not checked -o Image server (migration) - checked -(13:33:28) jsuchome: myslim, ze je to potreba vysvetlit v help textu -(13:33:52) jsuchome: aha, jako ze by to by ty labely byly predem pripravene -(13:34:01) Petr Ostadal: ano -(13:34:10) jsuchome: no, ale to je dost zmatek -(13:34:35) Petr Ostadal: mozna ta instalace by tam napsana byt ani nemusela -*/ - - // TRANSLATORS: Dialog help - _("<p>Please choose what type of server you would like to install and - press <b>Next</b>.</p><br> - <p>The installation will start upon pressing <b>Next</b>.<br> - </p>"), Label::BackButton(), Label::NextButton() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org