Author: benjimanw Date: Tue Apr 15 21:34:15 2008 New Revision: 46687 URL: http://svn.opensuse.org/viewcvs/yast?rev=46687&view=rev Log: Fixes from proof reading. Modified: trunk/metapackage/src/OneClickInstallCLI.ycp trunk/metapackage/src/OneClickInstallUI.ycp trunk/metapackage/src/OneClickInstallWidgets.ycp trunk/metapackage/src/OneClickInstallWorker.ycp trunk/metapackage/src/OneClickInstallWorkerResponse.ycp Modified: trunk/metapackage/src/OneClickInstallCLI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallCLI.ycp?rev=46687&r1=46686&r2=46687&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallCLI.ycp (original) +++ trunk/metapackage/src/OneClickInstallCLI.ycp Tue Apr 15 21:34:15 2008 @@ -26,7 +26,7 @@ if (OneClickInstall::HaveRepositories()) { - CommandLine::Print(_("If you choose to continue, the following repositories will be subscribed to:")); + CommandLine::Print(_("If you continue, the following repositories will be subscribed to:")); foreach (string repository, OneClickInstall::GetRequiredRepositories(), { CommandLine::Print("\t* " + repository); @@ -36,7 +36,7 @@ if (OneClickInstall::HaveSoftware()) { - CommandLine::Print(_("If you choose to continue, the following software packages will be installed:")); + CommandLine::Print(_("If you continue, the following software packages will be installed:")); foreach (string software, OneClickInstall::GetRequiredSoftware(), { CommandLine::Print("\t* " + software); @@ -185,7 +185,7 @@ ], "instructionsfile" : $[ - "help" : _("File containing internal representation of One Click Install instructions"), + "help" : _("File containing internal representation of <b>One Click Install</b> instructions"), "type" : "string" ] ], Modified: trunk/metapackage/src/OneClickInstallUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallUI.ycp?rev=46687&r1=46686&r2=46687&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallUI.ycp (original) +++ trunk/metapackage/src/OneClickInstallUI.ycp Tue Apr 15 21:34:15 2008 @@ -39,8 +39,8 @@ /** <region name="String constants"> **/ - string HELP1 = _("This wizard will install software onto your computer."); - string HELP2 = _("See http://en.opensuse.org/MetaPackages for more information."); + string HELP1 = _("This wizard will install software on your computer."); + string HELP2 = _("See <tt>http://en.opensuse.org/One_Click_Install</tt> for more information."); /** <region name="Define the UI components"> **/ @@ -181,7 +181,7 @@ { installation_steps_advanced = [ - $[ "id": "nothing", "label": _("Nothing to do") ], + $[ "id": "nothing", "label": _("Nothing to do.") ], ]; installation_widgets_advanced = [ Modified: trunk/metapackage/src/OneClickInstallWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWidgets.ycp?rev=46687&r1=46686&r2=46687&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWidgets.ycp (original) +++ trunk/metapackage/src/OneClickInstallWidgets.ycp Tue Apr 15 21:34:15 2008 @@ -57,7 +57,7 @@ term nothing = `VBox ( `Heading(_("Installation not possible")), - `RichText(_("The install link/file you opened does not contain instructions for this version of openSUSE.")) + `RichText(_("The install link or file you opened does not contain instructions for this version of openSUSE.")) ); @@ -66,7 +66,7 @@ `HSpacing(1), `VBox( `VSpacing(0.2), - `Heading( _("Please wait while this software is being installed.")), + `Heading( _("Wait while this software is being installed.")), `VSpacing(0.2) ), `HSpacing(1) @@ -223,9 +223,11 @@ `VBox( `Left (`Heading(Label::WarningMsg())), - `HCenter(`Label( _("Have you reviewed the changes that will be made to your system?\n(Malicious packages could damage your system.)") )), + `HCenter(`Label( _("Have you reviewed the changes that will be made to your system? +Malicious packages could damage your system. +") )), `VSpacing(0.4), - `Left(`CheckBox(`id(`iCanRead),`opt(`notify,`immediate),_("Don't ask me this again"))), + `Left(`CheckBox(`id(`iCanRead),`opt(`notify,`immediate),_("Do not ask me again"))), `VSpacing(0.2) ), `HBox( @@ -276,19 +278,19 @@ string tempOrPerm = ""; if ( !remainSubscribed) { - tempOrPerm = _("These repositories will only be added during installation, you will not remain subscribed."); + tempOrPerm = _("These repositories will only be added during installation. You will not remain subscribed."); } else { tempOrPerm = _("You will remain subscribed to these repositories after installation."); } string summaryStr = "" + - HTML::Colorize(_("If you choose to continue, the following changes will be made to your system") ,"red"); + HTML::Colorize(_("If you continue, the following changes will be made to your system") ,"red"); //Put remove message at top, incase people try to push it off the bottom of the warning by adding lots of packages. if (size(removals) > 0) { - summaryStr = summaryStr + HTML::Heading(HTML::Colorize(_("Software to be REMOVED:"),"red")) + + summaryStr = summaryStr + HTML::Heading(HTML::Colorize(_("Software to be removed:"),"red")) + removeStr; } @@ -349,7 +351,7 @@ global void PopulateDescriptionUI(string name, string summary, string description) { - UI::ReplaceWidget(`id(`head),`VBox(`Left(`Heading(name)),`Label(summary))); + UI::ReplaceWidget(`id(`head),`VBox(`Left(`Heading(name)),`Left(`Label(summary)))); UI::ChangeWidget(`id(`splashMessage),`Value,"" + HTML::Para( NewLinesToRichText(description)) + "</body>"); } @@ -391,7 +393,7 @@ } } else { - statusStr = statusStr + HTML::Para(_("Unfortunately the installation has failed, see the log file at /var/log/YaST2/y2log for more information. Failure stage was: ") + " " + failureStage); + statusStr = statusStr + HTML::Para(_("The installation has failed. For more information, see the log file at <tt>/var/log/YaST2/y2log</tt>. Failure stage was: ") + " " + failureStage); statusStr = statusStr + HTML::Heading(_("Error Message")) + HTML::Para(errorMessage); } Modified: trunk/metapackage/src/OneClickInstallWorker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorker.ycp?rev=46687&r1=46686&r2=46687&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorker.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorker.ycp Tue Apr 15 21:34:15 2008 @@ -32,7 +32,7 @@ if (!success) { OneClickInstallWorkerResponse::SetFailureStage("Adding Repositories"); - OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to subscribe to the required repositories. Please review the yast2 logs for more information.")); + OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to subscribe to the required repositories. Review the yast2 logs for more information.")); } @@ -51,7 +51,7 @@ if (!success) { OneClickInstallWorkerResponse::SetFailureStage("Removing Packages"); - OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to remove the specified packages. Please review the yast2 logs for more information.")); + OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to remove the specified packages. Review the yast2 logs for more information.")); } } @@ -64,7 +64,7 @@ if (!success) { OneClickInstallWorkerResponse::SetFailureStage("Installing Patterns"); - OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to install the specified patterns. Please review the yast2 logs for more information.")); + OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to install the specified patterns. Review the yast2 logs for more information.")); } } @@ -76,7 +76,7 @@ if (!success) { OneClickInstallWorkerResponse::SetFailureStage("Installing Packages"); - OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to install the specified packages. Please review the yast2 logs for more information.")); + OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to install the specified packages. Review the yast2 logs for more information.")); } } @@ -91,7 +91,7 @@ if (!success) { OneClickInstallWorkerResponse::SetFailureStage("Removing temporarily installed repositories."); - OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to unsubscribe from the repositories that were used to perform the installation. You can remove them manually in YaST > Software Repositories. Please review the yast2 logs for more information.")); + OneClickInstallWorkerResponse::SetErrorMessage(_("An error occurred while attempting to unsubscribe from the repositories that were used to perform the installation. You can remove them manually in YaST > Software Repositories. Review the yast2 logs for more information.")); } } Modified: trunk/metapackage/src/OneClickInstallWorkerResponse.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorkerResponse.ycp?rev=46687&r1=46686&r2=46687&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerResponse.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerResponse.ycp Tue Apr 15 21:34:15 2008 @@ -5,7 +5,7 @@ import "XML"; string DEFAULT_FAILURE_STAGE = _("unknown"); - string DEFAULT_ERROR_MESSAGE = _("Administrator (root) privileges are required, either they were not supplied or an unknown error occurred."); + string DEFAULT_ERROR_MESSAGE = _("Root privileges are required. Either they were not supplied, or an unknown error occurred."); string DEFAULT_NOTE = ""; string success = "false"; string note = DEFAULT_NOTE; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org