Author: jsuchome Date: Tue Aug 14 17:01:43 2007 New Revision: 40265 URL: http://svn.opensuse.org/viewcvs/yast?rev=40265&view=rev Log: - Merged proofread texts - 0.5.3 Modified: trunk/metapackage/VERSION trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstallUI.ycp trunk/metapackage/src/OneClickInstallWorker.ycp Modified: trunk/metapackage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/VERSION?rev=40265&r1=40264&r2=40265&view=diff ============================================================================== --- trunk/metapackage/VERSION (original) +++ trunk/metapackage/VERSION Tue Aug 14 17:01:43 2007 @@ -1 +1 @@ -0.5.2 +0.5.3 Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapackage-handler.changes?rev=40265&r1=40264&r2=40265&view=diff ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Tue Aug 14 17:01:43 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 14 16:54:48 CEST 2007 - jsuchome@suse.cz + +- Merged proofread texts +- 0.5.3 + +------------------------------------------------------------------- Mon Aug 6 16:39:26 CEST 2007 - mvidner@suse.cz - Added 10.3 to the tuxsaver example. Modified: trunk/metapackage/src/OneClickInstallUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallUI.ycp?rev=40265&r1=40264&r2=40265&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallUI.ycp (original) +++ trunk/metapackage/src/OneClickInstallUI.ycp Tue Aug 14 17:01:43 2007 @@ -53,14 +53,14 @@ string REPOSITORY_DESCRIPTION_HEADING = _("Repository Description:"); string SOFTWARE_DESCRIPTION_HEADING = _("Package Description:"); string REPOSITORY_HEADING = _("Additional Software Repositories"); - string SOFTWARE_HEADING = _("Software to be installed"); + string SOFTWARE_HEADING = _("Software to be Installed"); string REMOVE_HEADING = _("Software to be Removed"); - string PLEASE_WAIT = _("Please wait patiently while this software is installed."); + string PLEASE_WAIT = _("Please wait while this software is being installed."); string INSTALLATION_HEADING = _("Software installation"); - 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 onto your computer."); + string HELP2 = _("See http://en.opensuse.org/MetaPackages for more information."); string WARNING = _("Warning:"); - string WARNING1 = _("If you choose to continue the following changes will be made to your system"); + string WARNING1 = _("If you choose to continue, the following changes will be made to your system"); string REPOSITORY_SUMMARY = _("The following repositories will be subscribed to:"); string SOFTWARE_SUMMARY = _("The following software items will be installed:"); string REMOVE_SUMMARY = _("The following software items will be REMOVED:"); @@ -74,7 +74,7 @@ string WILL_NOT_REMAIN_SUBSCRIBED = _("These repositories will only be added during installation, you will not remain subscribed."); string NB = _("Note:"); string NOTHING = _("There is nothing to do."); - string REQUIRE_ADVANCED = _("Advanced mode, with ability to change settings."); + string REQUIRE_ADVANCED = _("Advanced mode with ability to change settings."); string SPLASH_HEADING = _("Welcome"); // %1: software package string WIZARD_DESCRIPTION = _("This wizard will install <b>%1</b> onto your computer."); Modified: trunk/metapackage/src/OneClickInstallWorker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorker.ycp?rev=40265&r1=40264&r2=40265&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorker.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorker.ycp Tue Aug 14 17:01:43 2007 @@ -206,7 +206,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. Please review the yast2 logs for more information.")); } //Remove any removals @@ -217,7 +217,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. Please review the yast2 logs for more information.")); } //if that was successful now try and install the patterns @@ -228,7 +228,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. Please review the yast2 logs for more information.")); } //if that was successful now try and install the packages @@ -239,7 +239,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. Please review the yast2 logs for more information.")); } //If we don't want to remain subscribed, remove the repositories that were added for installation. @@ -250,7 +250,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 > Installation Sources. 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. Please review the yast2 logs for more information.")); } OneClickInstallWorkerResponse::SetSuccess(success); @@ -258,7 +258,7 @@ if (success) { OneClickInstallWorkerResponse::SetFailureStage("No Failure"); - OneClickInstallWorkerResponse::SetErrorMessage(_("No error occurred")); + OneClickInstallWorkerResponse::SetErrorMessage(_("No error occurred.")); } //Overwrite the information we were passed with our response back to the UI. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org