Author: jsrain Date: Tue Apr 1 09:17:26 2008 New Revision: 45912 URL: http://svn.opensuse.org/viewcvs/yast?rev=45912&view=rev Log: merged texts from proofread Modified: trunk/installation/control/control.SLD.xml trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_congratulate.ycp trunk/installation/src/clients/inst_mode.ycp trunk/installation/src/clients/inst_network_check.ycp trunk/installation/src/clients/inst_network_setup.ycp trunk/installation/src/clients/inst_software_selection.ycp trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/control/control.SLD.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD.xml?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/control/control.SLD.xml (original) +++ trunk/installation/control/control.SLD.xml Tue Apr 1 09:17:26 2008 @@ -102,7 +102,7 @@ <p> The installation has completed successfully. Your system is ready for use. -Click Finish to log in to the system. +Click <b>Finish</b> to log in to the system. </p> <p> Please visit us at http://www.novell.com/linux/. Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Tue Apr 1 09:17:26 2008 @@ -111,7 +111,7 @@ <p> The installation has completed successfully. Your system is ready for use. -Click Finish to log in to the system. +Click <b>Finish</b> to log in to the system. </p> <p> Please visit us at http://www.novell.com/linux/. Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 1 09:17:26 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 1 10:15:34 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Mar 31 16:42:40 CEST 2008 - locilka@suse.cz - There are currently two possible patterns/desktops that can use Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_complex_welcome.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Tue Apr 1 09:17:26 2008 @@ -161,8 +161,8 @@ // help text, continued _("<p> -You can select <b>Abort</b> installation at any time to abort the -installation process. +Select <b>Abort</b> to abort the +installation process any time. </p> "); Modified: trunk/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_congratulate.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_congratulate.ycp (original) +++ trunk/installation/src/clients/inst_congratulate.ycp Tue Apr 1 09:17:26 2008 @@ -185,8 +185,7 @@ help = help + _("<p>Use <b>Clone</b> if you want to create an AutoYaST profile. AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST needs a profile to know what the installed system should look like. If this option is -selected, a profile of the current system is stored in /root/autoinst.xml.</p> -"); +selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"); if (show_zmd_turnoff_checkbox) help = help + turnoff_zmd_help; Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Tue Apr 1 09:17:26 2008 @@ -205,22 +205,19 @@ // help text for installation option (show_online_repositories == true ? _("<p> To use suggested remote repositories during installation or update, select -<b>Add Online Repositories Before Installation</b>.</p> -"):"") + +<b>Add Online Repositories Before Installation</b>.</p>"):"") + // 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 _("<p> -To let new installation create an automatic configuration, select -<b>Use Automatic Configuration</b>. Otherwise second stage installation -with configuration proposals will be called instead. Update mode does not -support automatic configuration.</p> -") + +To let the new installation to create an automatic configuration, select +<b>Use Automatic Configuration</b>. Otherwise, second stage installation +with configuration proposals will be used. Update mode does not +support automatic configuration.</p>") + // help text for installation method _("<p>Select <b>Repair Installed System</b> if you have a damaged Linux system on @@ -228,7 +225,7 @@ </p>") + // help text for installation method - _("<p>Features <b>Update</b> and <b>Repair Installed System</b> are only + _("<p>The features <b>Update</b> and <b>Repair Installed System</b> are only available if some Linux system has been detected. </p>"); } @@ -405,11 +402,9 @@ // %2 - logfile, possibly with errors // %3 - link to our bugzilla // %4 - directory where YaST logs are stored - sformat (_("Calling the YaST module %1 has failed. -More information can be found near the end of the '%2' file. - -This is worth reporting a bug at %3. -Please, attach also all YaST logs stored in the '%4' directory."), + sformat (_("Accessing the YaST module %1 has failed. +More information can be found in the '%2' file. +Please report this bug at %3 and attach the YaST logs stored in the '%4' directory."), "inst_repair", "/var/log/YaST2/y2log", "http://bugzilla.novell.com/", Modified: trunk/installation/src/clients/inst_network_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_network_check.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_network_check.ycp (original) +++ trunk/installation/src/clients/inst_network_check.ycp Tue Apr 1 09:17:26 2008 @@ -74,12 +74,13 @@ `Empty() ), `Left (`Label (_("No network setup has been found. -It is vitally important for using remote repositories -otherwise you can safely skip it."))) +It is important if using remote repositories, +otherwise you can safely skip it. +"))) ), `VSpacing (2), // TRANSLATORS: dialog label - `Left(`Label (_("Would you like to configure your network card now?"))), + `Left(`Label (_("Configure your network card now?"))), `VSpacing (1), `Frame ( // TRANSLATORS: frame label @@ -98,12 +99,13 @@ `VStretch() ), // TRANSLATORS: help text, part 1/2 - _("<p>The current installation system does not seem -to have configured network.</p>") + + _("<p>The current installation system does not +have a configured network.</p> +") + // TRANSLATORS: help text, part 2/2 _("<p>A configured network is needed for using remote repositories -or Add-On products. You do not need to set it up in case you do not want -to use any remote repository and you can skip the configuration then.</p>"), +or add-on products. If you do not use remote repositories, skip the configuratio.</p> +"), enable_next, enable_back ); Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_network_setup.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Tue Apr 1 09:17:26 2008 @@ -173,7 +173,7 @@ `Label (_("Probing network cards...")) ), // TRANSLATORS: dialog help - _("Please wait while installation is probing the network cards..."), + _("Please wait while the installation is probing the network cards..."), false, false ); @@ -275,8 +275,7 @@ // TRANSLATORS: pop-up error message Report::Error (_("No network card has been selected. -First, you need to select one network card -to configure it later.")); +Please select a network card to configure it later.")); return false; // Checking whether the netcard link is active @@ -287,10 +286,9 @@ sformat ( // TRANSLATORS: popup dialog question // %1 is replaced with a network device string - _("Link of the selected interface %1 is disconnected. + _("The link of the selected interface %1 is disconnected. It needs to be connected for a proper network configuration. - -Are you sure you want to use it despite the given fact?"), +Are you sure you want to use it?"), selected_netcard ), // TRANSLATORS: popup dialog button @@ -343,12 +341,12 @@ // TRANSLATORS: dialog help 1/3 _("<p>Here you can configure your network cards to be used immediately.</p>") + // TRANSLATORS: dialog help 2/3 - _("<p>If you don't need a network connection now, + _("<p>If you do not need a network connection now, you can safely skip the configuration.</p>") + // TRANSLATORS: dialog help 3/3 - _("<p>To configure a network card, select it from list -and click on the <b>Next</b> button, -otherwise click on the <b>Cancel</b> button.</p>"), + _("<p>To configure a network card, select it from the list +and click the <b>Next</b> button. +Otherwise,click<b>Cancel</b>.</p>"), Label::BackButton(), Label::NextButton() ); @@ -1143,14 +1141,13 @@ // TRANSLATORS: a pop-up dialog headline _("Internet Test Failed"), // TRANSLATORS: a pop-up dialog question, see buttons *3 - _("Because the Internet connection test failed, you should be + _("The Internet connection test failed. You should be redirected to the previous dialog to change the configuration. - -Would you like to go back to change it?"), +Go back and change it?"), // TRANSLATORS: popup dialog button (*3) _("Go Back"), // TRANSLATORS: popup dialog button (*3) - _("Skip It"), + _("Skip"), `yes )) { return false; @@ -1385,9 +1382,8 @@ if (all_ok != true) { y2warning ("Writing has failed, returning to the previous dialog"); Report::Error (_("Writing the network settings failed. - -You will be returned to the previous dialog either -to change the settings or to cancel the network setup.")); +You will be returned to the previous dialog to either +change the settings, or cancel the network setup.")); return `back; } Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_software_selection.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Tue Apr 1 09:17:26 2008 @@ -179,8 +179,7 @@ break; } Popup::Message (_("No system type was selected. - -Select the default one, please.")); +Select the default type.")); continue; } else if (ret == `abort || ret == `cancel) { if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete)) { Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_upgrade_urls.ycp?rev=45912&r1=45911&r2=45912&view=diff ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Tue Apr 1 09:17:26 2008 @@ -102,7 +102,7 @@ // TRANSLATORS: dialog text, possibly multiline, // Please, do not use more than 50 characters per line. `Left (`Label (_("These repositories were found on the system -you are just upgrading:"))), +you are upgrading:"))), `Table ( `id ("table_of_repos"), `opt (`notify), @@ -126,9 +126,8 @@ ) ), // TRANSLATORS: help text 1/3 - _("<p>Here you can see all software repositories that were found -on the system you are just upgrading. You have better enable -those you want to include in the upgrade process.</p>") + + _("<p>Here you see all software repositories found +on the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>") + // TRANSLATORS: help text 2/3 _("<p>To enable or disable an URL, click on the <b>Toggle Status</b> button or double-click on the respective table item.</p>") + @@ -412,9 +411,8 @@ // TRANSLATORS: popup header _("Network is not Configured"), // TRANSLATORS: popup question - _("Remote repositories require the Internet connection. - -Would you like to configure it?"), + _("Remote repositories require an Internet connection. +Configure it?"), Label::YesButton(), Label::NoButton(), `yes @@ -570,7 +568,7 @@ Report::Error (sformat ( // TRANSLATORS: error report // %1 is replaced with repo-name, %2 with repo-URL - _("An error occurred when refreshing repository + _("An error occurred while refreshing repository Name: %1 URL: %2"), repo_name, @@ -666,7 +664,7 @@ _("Initializing package manager..."), ], // TRANSLATORS: dialog help - _("<p>Please wait, while repositories are being read...</p>") + _("<p>Please wait while repositories are being read...</p>") ); Wizard::SetTitleIcon ("yast-sw_source"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org