[yast-commit] r66814 - in /trunk/update: ./ package/ src/clients/ src/include/ src/modules/
Author: jsuchome Date: Wed Nov 16 11:23:18 2011 New Revision: 66814 URL: http://svn.opensuse.org/viewcvs/yast?rev=66814&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/clients/inst_backup.ycp trunk/update/src/clients/inst_update.ycp trunk/update/src/clients/update_proposal.ycp trunk/update/src/include/rootpart.ycp trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Wed Nov 16 11:23:18 2011 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Nov 16 11:23:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:22:38 CET 2011 - jsuchome@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Fri Sep 23 11:01:27 UTC 2011 - lslezak@suse.cz - code cleanup - removed obsoled code for handling selections Modified: trunk/update/src/clients/inst_backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_backup.ycp?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/src/clients/inst_backup.ycp (original) +++ trunk/update/src/clients/inst_backup.ycp Wed Nov 16 11:23:18 2011 @@ -112,7 +112,7 @@ // help text for backup dialog during update 1/7 string help_text = _("<p>To avoid any loss of information during update, -it is possible to create a <b>backup</b> prior to updating.</p> +create a <b>backup</b> prior to updating.</p> "); // help text for backup dialog during update 2/7 @@ -126,13 +126,13 @@ // help text for backup dialog during update 4/7 help_text = help_text + _("<p><b>Create a Backup of Modified Files:</b> -Stores those modified files that are replaced during update.</p> +Stores only those modified files that will be replaced during update.</p> "); // help text for backup dialog during update 5/7 help_text = help_text + _("<p><b>Create a Complete Backup of /etc/sysconfig:</b> This covers all configuration files that are part of the -sysconfig mechanism, even those that are not replaced.</p> +sysconfig mechanism, even those that will not be replaced.</p> "); // help text for backup dialog during update 6/7 Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.ycp?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Nov 16 11:23:18 2011 @@ -95,8 +95,8 @@ // help text for dialog "update options" 1/4 - string helptext = _("<p>The update option differs between two modes. In -either case, it is recommended to make a backup of your personal data.</p> + string helptext = _("<p>The update option offers two different modes. In +either case, we recommend to make a backup of your personal data.</p> "); // help text for dialog "update options" 2/4, %1 is a product name @@ -110,7 +110,7 @@ helptext = helptext + _("<p><b>Only Installed Packages:</b> This selection only updates the packages already installed on your system. <i>Note:</i> New software in the predefined software selection, such as new YaST modules, is -not available after the update. You might miss advertised features.</p> +not available after the update. You might miss new features.</p> "); // help text for dialog "update options" 4/4 Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_proposal.ycp?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Wed Nov 16 11:23:18 2011 @@ -332,8 +332,9 @@ // TRANSLATORS: proposal error, %1 is the version of installed system // %2 is the version being installed _("Updating system to another version (%1 -> %2) is not supported on the running system.<br> -Please, boot from the installation media and use a normal upgrade -or disable software repositories of products with different versions."), +Boot from the installation media and use a normal upgrade +or disable software repositories of products with different versions. +"), update_from, update_to ), "warning_level" : `fatal, @@ -406,10 +407,11 @@ SpaceCalculation::GetPartitionInfo(); // TRANSLATORS: proposal dialog help - string update_options_help = _("<p><b><big>Update Options</big></b> -Here you can choose how your system is going to be updated. -Choose whether only installed packages should be updated or whether new ones should be installed also -(the default selection), and whether unmaintained packages should be deleted.</p>"); + string update_options_help = _("<p><b><big>Update Options</big></b> Select how your system will be updated. +Choose if only installed packages should be updated or new ones should be +installed as well (default). Decide whether unmaintained packages should be +deleted.</p> +"); ret = $[ "preformatted_proposal" : HTML::ListStart() + summary_text + HTML::ListEnd(), Modified: trunk/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/src/include/rootpart.ycp (original) +++ trunk/update/src/include/rootpart.ycp Wed Nov 16 11:23:18 2011 @@ -327,7 +327,8 @@ cont = Popup::ContinueCancel ( // continue-cancel popup _("The architecture of the system installed in the selected partition -is different than the one of this product.")); +is different from the one of this product. +")); } if (! cont) Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=66814&r1=66813&r2=66814&view=diff ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Nov 16 11:23:18 2011 @@ -443,7 +443,8 @@ // %1 is a device name such as /dev/hda5 _("The file system check of device %1 has failed. -Would you like to continue in the mounting the device?"), device +Do you want to continue mounting the device? +"), device ), Label::ContinueButton(), // button @@ -961,11 +962,12 @@ // %2 with the recommended size sformat ( _("Your /boot partition is too small (%1 MB). -We recommend a size not less than %2 MB. It might happen, that the -new Kernel does not fit, so it would be safer to either enlarge that partition -or not to use the /boot partition at all. +We recommend a size of no less than %2 MB or else the new Kernel may not fit. +It is safer to either enlarge the partition +or not use a /boot partition at all. -Would you like to continue updating the current system?"), +Do you want to continue updating the current system? +"), current_bs, suggested_bs ) @@ -1037,9 +1039,10 @@ %2 If you are sure that the partition is not necessary for the -update (it is not any system partition), click Continue. +update (not a system partition), click Continue. To check or fix the mount options, click Specify Mount Options. -To abort update, click Cancel."), +To abort the update, click Cancel. +"), spec, mount_err) ), `VSpacing (1), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsuchome@svn2.opensuse.org