Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2011-11-16 17:22:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2011-11-07 14:35:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2011-11-16 17:23:39.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 16 13:18:40 CET 2011 - [email protected] + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- +Thu Nov 10 14:27:55 UTC 2011 - [email protected] + +- Disable routing initscript commands through systemd, prevent + lockups. + +------------------------------------------------------------------- Old: ---- yast2-installation-2.21.28.tar.bz2 New: ---- yast2-installation-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.V7TEtY/_old 2011-11-16 17:23:41.000000000 +0100 +++ /var/tmp/diff_new_pack.V7TEtY/_new 2011-11-16 17:23:41.000000000 +0100 @@ -19,7 +19,7 @@ Name: yast2-installation -Version: 2.21.28 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ YaST2-Firstboot.service ++++++ --- /var/tmp/diff_new_pack.V7TEtY/_old 2011-11-16 17:23:41.000000000 +0100 +++ /var/tmp/diff_new_pack.V7TEtY/_new 2011-11-16 17:23:41.000000000 +0100 @@ -6,6 +6,7 @@ [Service] Type=oneshot +Environment=SYSTEMD_NO_WRAP=1 ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system TimeoutSec=0 ++++++ YaST2-Second-Stage.service ++++++ --- /var/tmp/diff_new_pack.V7TEtY/_old 2011-11-16 17:23:41.000000000 +0100 +++ /var/tmp/diff_new_pack.V7TEtY/_new 2011-11-16 17:23:41.000000000 +0100 @@ -6,6 +6,7 @@ [Service] Type=oneshot +Environment=SYSTEMD_NO_WRAP=1 ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 ++++++ yast2-installation-2.21.28.tar.bz2 -> yast2-installation-2.22.0.tar.bz2 ++++++ ++++ 3841 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/VERSION new/yast2-installation-2.22.0/VERSION --- old/yast2-installation-2.21.28/VERSION 2011-11-06 18:00:37.000000000 +0100 +++ new/yast2-installation-2.22.0/VERSION 2011-11-16 13:19:13.000000000 +0100 @@ -1 +1 @@ -2.21.28 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/deploy_image_auto.ycp new/yast2-installation-2.22.0/src/clients/deploy_image_auto.ycp --- old/yast2-installation-2.21.28/src/clients/deploy_image_auto.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/deploy_image_auto.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -111,7 +111,7 @@ `VSpacing (0.5), `Left(`RadioButton ( `id (`dont_inst_from_images), `opt(`notify), - _("&Do Not Install from Images"), + _("&Do not Install from Images"), (Installation::image_installation != true) )) )) @@ -151,10 +151,11 @@ `HStretch () ), // TRANSLATORS: help text - _("<p><b>Installation from Images</b> is used to speed the installation up. -Images contain compressed snapshots of installed system matching your selection -of patterns. The rest of packages which are not in images will be installed from -packages the standard way.</p>") + _("<p><b>Creating own Images</b> is used if you + _("<p><b>Installation from Images</b> is used to speed the installation up. +Images contain compressed snapshots of an installed system matching your +selection of patterns. The rest of the packages which are not contained in the +images will be installed from packages the standard way.</p> +") + _("<p><b>Creating own Images</b> is used if you want to skip the complete step of RPM installation. Instead AutoYaST will dump an image on the harddisk which is a lot faster and can be pre-configured already. Everything else than RPM installation is done like during a normal auto-installation.</p>"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/deploying_proposal.ycp new/yast2-installation-2.22.0/src/clients/deploying_proposal.ycp --- old/yast2-installation-2.21.28/src/clients/deploying_proposal.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/deploying_proposal.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -36,14 +36,14 @@ ret = ret + "<li>" + sformat ( // TRANSLATORS: Installation overview // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Installation from images is enabled (<a href=\"%1\">disable</a>)"), + _("Installation from images is enabled (<a href=\"%1\">disable</a>)."), im_do_disable ) + "</li>"; } else { ret = ret + "<li>" + sformat ( // TRANSLATORS: Installation overview // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Installation from images is disabled (<a href=\"%1\">enable</a>)"), + _("Installation from images is disabled (<a href=\"%1\">enable</a>)."), im_do_enable ) + "</li>"; } @@ -80,9 +80,9 @@ "links" : [ im_do_enable, im_do_disable ], // TRANSLATORS: help text "help" : _("<p><b>Installation from Images</b> is used to speed the installation up. -Images contain compressed snapshots of an installed system matching your selection -of patterns. The rest of packages which are not in images will be installed from -packages the standard way.</p> +Images contain compressed snapshots of an installed system matching your +selection of patterns. The rest of the packages which are not contained in the +images will be installed from packages the standard way.</p> ") + // TRANSLATORS: help text _("<p>Installation from images is disabled by default if the current @@ -91,7 +91,7 @@ } else { y2error ("Installation from images should be used for new installation only!"); ret = $[ - "preformatted_proposal" : sformat (_("Error: Images should not be used for mode: %1"), Mode::mode()), + "preformatted_proposal" : sformat (_("Error: Images should not be used for mode: %1."), Mode::mode()), "warning_level" : `error, ]; } @@ -116,7 +116,7 @@ CallProposalScript(); if (old_status == false && old_status == Installation::image_installation) { - Report::Message (_("Unable to enable installation from images. + Report::Message (_("Cannot enable installation from images. Currently selected patterns do not fit the images stored on the installation media. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.22.0/src/clients/inst_addon_update_sources.ycp --- old/yast2-installation-2.21.28/src/clients/inst_addon_update_sources.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_addon_update_sources.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -62,7 +62,7 @@ // feedback heading -string heading = _("Add-On Product Installation"); +string heading = _("Add-on Product Installation"); // feedback message string message = _("Reading packages available in the repositories..."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.22.0/src/clients/inst_automatic_configuration.ycp --- old/yast2-installation-2.21.28/src/clients/inst_automatic_configuration.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_automatic_configuration.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -190,7 +190,7 @@ 0 ) ), - _("<p>Installation is currently writing the automatic configuration. Please wait...</p>"), + _("<p>Writing automatic configuration...</p>"), false, false ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.22.0/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.21.28/src/clients/inst_complex_welcome.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_complex_welcome.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -160,9 +160,10 @@ // help text, continued // Describes the #ICW_B1 button _("<p> -License has to be accepted before continuing the installation. +The license must be accepted before the installation continues. Use <b>License Translations...</b> to show the license in all available translations. -</p>") + +</p> +") + // help text, continued _("<p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_congratulate.ycp new/yast2-installation-2.22.0/src/clients/inst_congratulate.ycp --- old/yast2-installation-2.21.28/src/clients/inst_congratulate.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_congratulate.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -85,7 +85,8 @@ // TRANSLATORS: help text, see #ZMD turnoff_zmd_help = _("<p>Select <b>Disable ZMD Service</b> to stop and disable -the ZMD service during the system start.</p>"); +the ZMD service during system start.</p> +"); } else { y2milestone ("ZMD Turnoff check-box will be invisible"); } @@ -161,7 +162,7 @@ string help = _("<p>Your system is ready for use.</p>") + // help 2/4 for dialog "Congratulation Dialog" - _("<p><b>Finish</b> will close the YaST installation and continue + _("<p><b>Finish</b> will close the YaST installation and take you to the login screen.</p> ") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_deploy_image.ycp new/yast2-installation-2.22.0/src/clients/inst_deploy_image.ycp --- old/yast2-installation-2.21.28/src/clients/inst_deploy_image.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_deploy_image.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -319,8 +319,9 @@ // BNC #444209 // false == error if (dep_ret == false) { - Report::Error (_("Deploying from images has failed. -Aborting the installation...")); + Report::Error (_("Deploying images has failed. +Aborting the installation... +")); y2milestone ("Aborting..."); return `abort; // nil == aborted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_initialization.ycp new/yast2-installation-2.22.0/src/clients/inst_initialization.ycp --- old/yast2-installation-2.21.28/src/clients/inst_initialization.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_initialization.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -26,7 +26,7 @@ } // TRANSLATORS: dialog help -string helptext = _("Please wait while the installation is being initialized."); +string helptext = _("Installation is being initialized."); // TRANSLATORS: dialog progress message string label = _("Initializing the installation..."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_mode.ycp new/yast2-installation-2.22.0/src/clients/inst_mode.ycp --- old/yast2-installation-2.21.28/src/clients/inst_mode.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_mode.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -156,7 +156,7 @@ `Left (`CheckBox ( `id (`add_on), `opt(`notify), // check box - _("In&clude Add-On Products from Separate Media"), + _("In&clude Add-on Products from Separate Media"), Installation::add_on_selected )), (InstData::enable_autoconfiguration == true ? @@ -183,8 +183,9 @@ _("<p> Select <b>New Installation</b> if there is no existing Linux system on your machine or if you want to replace an existing Linux system completely, -abandoning all its configuration data. -</p>") + +discarding all its configuration data. +</p> +") + // help text for installation method _("<p> @@ -201,7 +202,8 @@ // help text for installation method _("<p> To install an add-on product from separate media together with &product;, select -<b>Include Add-On Products from Separate Media</b>.</p>") + +<b>Include Add-on Products from Separate Media</b>.</p> +") + // help text for installation method (InstData::enable_autoconfiguration == true ? _("<p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_network_setup.ycp new/yast2-installation-2.22.0/src/clients/inst_network_setup.ycp --- old/yast2-installation-2.21.28/src/clients/inst_network_setup.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_network_setup.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -173,7 +173,7 @@ `Label (_("Probing network cards...")) ), // TRANSLATORS: dialog help - _("Please wait while the installation is probing the network cards..."), + _("Network cards are being probed now."), false, false ); @@ -275,7 +275,8 @@ // TRANSLATORS: pop-up error message Report::Error (_("No network card has been selected. -Please select a network card to configure it later.")); +Select a network card to configure it later. +")); return false; // Checking whether the netcard link is active @@ -292,7 +293,7 @@ selected_netcard ), // TRANSLATORS: popup dialog button - _("&Yes, Use It"), + _("&Yes, Use it"), Label::NoButton(), `no_button )) { @@ -320,7 +321,7 @@ // TRANSLATORS: dialog caption _("Network Setup"), `VBox ( - `Left (`Label (_("Please, select a network card to be configured"))), + `Left (`Label (_("Select a network card to be configured."))), `VWeight (3, `Table ( `id ("netcard_selection"), `opt (`notify, `immediate), @@ -346,7 +347,8 @@ // TRANSLATORS: dialog help 3/3 _("<p>To configure a network card, select it from the list and click the <b>Next</b> button. -Otherwise,click<b>Cancel</b>.</p>"), +Otherwise, click <b>Cancel</b>.</p> +"), Label::BackButton(), Label::NextButton() ); @@ -625,7 +627,7 @@ `Left (`Label (sformat( // TRANSLATORS: dialog label, %1 is replaced with a selected network device name, e.g, eth3 // See *2 - _("Please, select your network setup type for %1"), + _("Select your network setup type for %1"), // TRANSLATORS: a fallback card name for *2 network_settings["network_device"]:_("Unknown Network Card") ))), @@ -671,9 +673,9 @@ `HSquash (`MinWidth (6, `ComboBox (`id ("proxy_port"), `opt (`editable), _("&Port"), [ "", "3128", "8080" ]))) )), `Left (`HBox ( - `HSquash (`MinWidth (14, `InputField (`id ("proxy_user"), _("Us&er (Optional)")))), + `HSquash (`MinWidth (14, `InputField (`id ("proxy_user"), _("Us&er (optional)")))), `HSpacing (0.5), - `HSquash (`MinWidth (14, `Password (`id ("proxy_password"), _("Pass&word (Optional)")))) + `HSquash (`MinWidth (14, `Password (`id ("proxy_password"), _("Pass&word (optional)")))) )) ) )) @@ -692,15 +694,17 @@ ), // TRANSLATORS: dialog help 1/2 _("<p><big><b>Network Setup</b></big> -<br>Here you can configure your network card. +<br>Configure your network card. Select either DHCP or static setup. DHCP fits for most cases. For details contact your Internet provider or your network -administrator.</p>") + +administrator.</p> +") + // TRANSLATORS: dialog help 2/2 _("<p><big><b>Proxy</b></big> <br>Proxy is a server-based cache for accessing the web. In most cases, if you have a direct connection to the Internet, -it doesn't need to be used.</p>"), +you do not need to use one.</p> +"), Label::BackButton(), Label::OKButton() ); @@ -1348,7 +1352,7 @@ Progress::NewProgressIcons ( // TRANSLATORS: dialog caption - _("Writing Network Setup"), + _("Writing Network Setup..."), " ", size (actions_todo), actions_todo, @@ -1383,7 +1387,8 @@ y2warning ("Writing has failed, returning to the previous dialog"); Report::Error (_("Writing the network settings failed. You will be returned to the previous dialog to either -change the settings, or cancel the network setup.")); +change the settings or cancel the network setup. +")); return `back; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_proposal.ycp new/yast2-installation-2.22.0/src/clients/inst_proposal.ycp --- old/yast2-installation-2.21.28/src/clients/inst_proposal.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_proposal.ycp 2011-11-16 13:13:54.000000000 +0100 @@ -803,7 +803,7 @@ vbox = `VBox( // Help message between headline and installation proposal / settings summary. // May contain newlines, but don't make it very much longer than the original. - `Left( `Label( _("Click any headline to make changes or use the \"Change...\" menu below.") ) ), + `Left( `Label( _("Click a headline to make changes or use the \"Change...\" menu below.") ) ), rt, menu_box ); @@ -992,7 +992,7 @@ // Help text for installation proposal, continued help_text_string = help_text_string + _("<p> -Your hard disk has not been modified in any way, so you can still safely abort. +Your hard disk has not been modified yet. You can still safely abort. </p> "); } @@ -1014,7 +1014,7 @@ // Help text for installation proposal, continued help_text_string = help_text_string + _("<p> -Your hard disk has not been modified in any way, so you can still safely abort. +Your hard disk has not been modified yet. You can still safely abort. </p> "); } @@ -1075,8 +1075,9 @@ { // help text help_text_string = help_text_string + _("<p>Some proposals might be -locked by the system administrator, so cannot be changed. To change -a proposal that is locked, ask your system administrator.</p>"); +locked by the system administrator and therefore cannot be changed. If a +locked proposal needs to be changed, ask your system administrator.</p> +"); } foreach (string submod, submodules_presentation, { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_release_notes.ycp new/yast2-installation-2.22.0/src/clients/inst_release_notes.ycp --- old/yast2-installation-2.21.28/src/clients/inst_release_notes.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_release_notes.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -215,8 +215,9 @@ term contents = `VBox (`VSpacing (0.5), relnoteslayout, `VSpacing (0.5)); /* help text for dialog "Release Notes" */ - string help = _("<p>Here are the <b>release notes</b> for the installed -Linux system. They provide a brief summary of new features and changes.</p>"); + string help = _("<p>The <b>release notes</b> for the installed Linux system provide a brief +summary of new features and changes.</p> +"); // in normal mode no BackAbortNext-button layout // bugzilla #262440 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_scenarios.ycp new/yast2-installation-2.22.0/src/clients/inst_scenarios.ycp --- old/yast2-installation-2.21.28/src/clients/inst_scenarios.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_scenarios.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -182,8 +182,9 @@ } // TRANSLATORS: help text - string dialog_help = _("<p>Select a scenario that matches your needs the best. -Additional software can be selected later in software proposal.</p>"); + string dialog_help = _("<p>Select the scenario that meets your needs best. +Additional software can be selected later in software proposal.</p> +"); // Adjust dialog Wizard::SetContents ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_suseconfig.ycp new/yast2-installation-2.22.0/src/clients/inst_suseconfig.ycp --- old/yast2-installation-2.21.28/src/clients/inst_suseconfig.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_suseconfig.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -139,7 +139,7 @@ if (! automatic_configuration && !Mode::commandline ()) { Wizard::SetContents( // Dialog title for SuSEconfig dialog - _("Writing the system configuration"), + _("Writing the system configuration..."), contents, help, GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::DisableAbortButton(); } @@ -160,7 +160,7 @@ // prior to calling any SuSEconfig module. // - logStep( _("Setting up linker cache") ); + logStep( _("Setting up linker cache...") ); runStep( "/sbin/ldconfig" ); // This is the same as: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_system_analysis.ycp new/yast2-installation-2.22.0/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.21.28/src/clients/inst_system_analysis.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_system_analysis.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -245,9 +245,9 @@ visible_icons = add (visible_icons, "32x32/apps/yast-firewire.png"); // TRANSLATORS: progress step - actions_todo = add (actions_todo, _("Probe floppy disks devices")); + actions_todo = add (actions_todo, _("Probe floppy disk devices")); // TRANSLATORS: progress step - actions_doing = add (actions_doing, _("Probing floppy disks devices...")); + actions_doing = add (actions_doing, _("Probing floppy disk devices...")); actions_functions = add (actions_functions, ActionFloppyDisks); visible_icons = add (visible_icons, "32x32/apps/yast-floppy.png"); } @@ -313,7 +313,7 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("Please wait while computer hardware and installed systems are being probed..."), + _("YaST is probing computer hardware and installed systems now."), [visible_icons] ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.22.0/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.21.28/src/clients/inst_upgrade_urls.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_upgrade_urls.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -558,7 +558,7 @@ `Label (_("Adding and removing repositories...")) ), // TRANSLATORS: help text - _("<p>Please wait while repositories are being added and removed.</p>"), + _("<p>Repositories are being added and removed.</p>"), false, false ); @@ -604,7 +604,7 @@ actions_todo, actions_doing, // TRANSLATORS: help text - _("<p>Please wait while repositories are being added and removed.</p>") + _("<p>Repositories are being added and removed.</p>") ); } @@ -701,7 +701,8 @@ sformat(_("Make sure that media with label %1 is in the CD/DVD drive. -If you skip it, repository will not be added."), name), +If you skip it, the repository will not be added. +"), name), Label::OKButton(), Label::SkipButton(), `yes @@ -797,9 +798,10 @@ Report::Error (sformat ( // TRANSLATORS: error report // %1 is replaced with repo-name, %2 with repo-URL - _("An error occurred when enabling repository + _("An error occurred while enabling repository Name: %1 -URL: %2"), +URL: %2 +"), repo_name, one_url )); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/inst_welcome.ycp new/yast2-installation-2.22.0/src/clients/inst_welcome.ycp --- old/yast2-installation-2.21.28/src/clients/inst_welcome.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/inst_welcome.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -53,7 +53,7 @@ // help ttext -string help = _("<p>Click <b>Next</b> to go through the +string help = _("<p>Click <b>Next</b> to perform the basic configuration of the system.</p> "); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/clients/release_notes_popup.ycp new/yast2-installation-2.22.0/src/clients/release_notes_popup.ycp --- old/yast2-installation-2.21.28/src/clients/release_notes_popup.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/clients/release_notes_popup.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -112,10 +112,11 @@ text = // beginning of the rich text with the release notes -_("<p><b>These are the release notes made for the first initial release. They are +_("<p><b>These are the release notes for the initial release. They are part of the installation media. During installation, if a connection to the Internet is available, you can download updated release notes -from the SUSE Linux Web server.</b></p>") + text; +from the SUSE Linux Web server.</b></p> +") + text; // bugzilla #221222, #213239 map display_info = UI::GetDisplayInfo(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/include/inst_inc_all.ycp new/yast2-installation-2.22.0/src/include/inst_inc_all.ycp --- old/yast2-installation-2.21.28/src/include/inst_inc_all.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/include/inst_inc_all.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -65,7 +65,7 @@ if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step || ret == `abort) { // TRANSLATORS: busy message - UI::OpenDialog (`Label(_("Writing YaST Configuration..."))); // #2 + UI::OpenDialog (`Label(_("Writing YaST configuration..."))); // #2 } else { // FATE #304395: Disabling (or handling) screensaver during installation // Enabling screen-saver on exit @@ -125,10 +125,10 @@ // Somehow the graphical frontend failed and we're running in // text mode. Inform the user about this fact. x11_msg = sformat(_("Your computer does not fulfill all requirements for -a graphical installation. There is less than %1 MB +a graphical installation. There is either less than %1 MB memory or the X server could not be started. -As a fallback, the text front-end of YaST2 will guide you +As fallback, the text front-end of YaST2 will guide you through the installation. This front-end offers the same functionality as the graphical one, but the screens differ from those in the manual. @@ -145,10 +145,10 @@ // text mode. Inform the user about this fact. x11_msg = _("The graphical interface could not be started. -The required packages were not installed (minimal installation) or -the graphics card is not properly supported. +Either the required packages were not installed (minimal installation) +or the graphics card is not properly supported. -As a fallback, the text front-end of YaST2 will guide you +As fallback, the text front-end of YaST2 will guide you through the installation. This front-end offers the same functionality as the graphical one, but the screens differ from those in the manual. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/include/inst_inc_second.ycp new/yast2-installation-2.22.0/src/include/inst_inc_second.ycp --- old/yast2-installation-2.21.28/src/include/inst_inc_second.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/include/inst_inc_second.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -233,7 +233,7 @@ start_service, starting_service, // TRANSLATORS: dialog help - _("Please wait while network settings are being adjusted...") + _("Network settings are being adjusted.") ); Wizard::SetTitleIcon ("yast-network"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/include/misc.ycp new/yast2-installation-2.22.0/src/include/misc.ycp --- old/yast2-installation-2.21.28/src/include/misc.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/include/misc.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -137,7 +137,7 @@ heading = HTML::Heading(_("Confirm Installation")); // Text for confirmation popup before the installation really starts 1/3 - body = _("<p>All information required for the base installation is now complete.</p>"); + body = _("<p>Information required for the base installation is now complete.</p>"); boolean some_destructive = find(map info, Storage::GetCommitInfos(), { return info[`destructive]:false; @@ -171,7 +171,7 @@ body = // Text for confirmation popup before the update really starts 1/3 - _("<p>All information required to perform an update is now complete.</p>") + _("<p>Information required to perform an update is now complete.</p>") // Text for confirmation popup before the update really starts 2/3 + _(" <p>If you continue now, data on your hard disk will be overwritten diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/include/scr_switch_debugger.ycp new/yast2-installation-2.22.0/src/include/scr_switch_debugger.ycp --- old/yast2-installation-2.21.28/src/include/scr_switch_debugger.ycp 2011-10-11 09:06:08.000000000 +0200 +++ new/yast2-installation-2.22.0/src/include/scr_switch_debugger.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -105,12 +105,13 @@ // %2 - link to our bugzilla // %3 - directory where YaST logs are stored // %4 - link to the Yast Bug Reporting HOWTO Web page - _("Switching to the installed system has failed -More information can be found near the end of the '%1' file. + _("Switching to the installed system has failed. +Find more information near the end of the '%1' file. This is worth reporting a bug at %2. -Please, attach also all YaST logs stored in the '%3' directory. -See %4 for more information about YaST logs."), +Please, attach all YaST logs stored in the '%3' directory. +See %4 for more information about YaST logs. +"), "/var/log/YaST2/y2log", "http://bugzilla.novell.com/";, "/var/log/YaST2/", @@ -163,7 +164,8 @@ // %1 - link to our bugzilla // %2 - directory where YaST logs are stored _("This is worth reporting a bug at %1. -Please, attach also all YaST logs stored in the '%2' directory."), +Please, attach all YaST logs stored in the '%2' directory. +"), "http://bugzilla.novell.com/";, "/var/log/YaST2/" ) + @@ -540,7 +542,7 @@ // YaST got killed } else if (regexpmatch (one_line, " got signal ")) { // Print just the last line - ReportLine (_("YaST process got killed")); + ReportLine (_("YaST process got killed.")); PrintLinesFromTo (current_line, current_line); ret = false; break; @@ -670,7 +672,7 @@ integer new_SCR = WFM::SCROpen ("chroot=" + new_SCR_path + ":scr", false); if (new_SCR < 0) { y2error("Cannot conenct to SCR %1", new_SCR_path); - Popup::Error(_("Connecting to the inst-sys failed, debugger cannot continue.")); + Popup::Error(_("Connecting to the inst-sys failed. Debugger cannot continue.")); return; } // Set the new SCR as a defalt one diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/inst_finish/ldconfig_finish.ycp new/yast2-installation-2.22.0/src/inst_finish/ldconfig_finish.ycp --- old/yast2-installation-2.21.28/src/inst_finish/ldconfig_finish.ycp 2011-10-11 09:06:16.000000000 +0200 +++ new/yast2-installation-2.22.0/src/inst_finish/ldconfig_finish.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -36,7 +36,7 @@ return (any)$[ "steps" : 1, // progress step title - "title" : _("Setting up linker cache"), + "title" : _("Setting up linker cache..."), "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.28/src/inst_finish/yast_inf_finish.ycp new/yast2-installation-2.22.0/src/inst_finish/yast_inf_finish.ycp --- old/yast2-installation-2.21.28/src/inst_finish/yast_inf_finish.ycp 2011-10-11 09:06:16.000000000 +0200 +++ new/yast2-installation-2.22.0/src/inst_finish/yast_inf_finish.ycp 2011-11-16 13:12:33.000000000 +0100 @@ -147,7 +147,7 @@ return (any)$[ "steps" : 1, // progress step title - "title" : _("Writing YaST Configuration..."), + "title" : _("Writing YaST configuration..."), "when" : [ `installation, `update, `autoinst ], ]; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
