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-installation/VERSION?rev=57812&r1=57811&r2=57812&view=diff ============================================================================== --- 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-installation/package/yast2-pos-installation.changes?rev=57812&r1=57811&r2=57812&view=diff ============================================================================== --- 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-installation/src/clients/inst_slepos_detection.ycp?rev=57812&r1=57811&r2=57812&view=diff ============================================================================== --- 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-installation/src/clients/inst_slepos_migration.ycp?rev=57812&r1=57811&r2=57812&view=diff ============================================================================== --- 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-installation/src/clients/inst_slepos_server_selection.ycp?rev=57812&r1=57811&r2=57812&view=diff ============================================================================== --- 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