Author: jsrain Date: Thu Sep 11 07:55:27 2008 New Revision: 50997 URL: http://svn.opensuse.org/viewcvs/yast?rev=50997&view=rev Log: merged texts from proofread Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/library/packages/src/PackageLock.ycp trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageCallbacks.ycp?rev=50997&r1=50996&r2=50997&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Thu Sep 11 07:55:27 2008 @@ -836,7 +836,7 @@ } button_box = `VBox( - `Left(`CheckBox(`id(`auto_eject), _("A&utomatically Eject CD/DVD Medium"), auto_eject)), + `Left(`CheckBox(`id(`auto_eject), _("A&utomatically Eject CD or DVD Medium"), auto_eject)), button_box ); } @@ -2224,7 +2224,7 @@ if (Mode::commandline()) { // progress message (command line mode) - CommandLine::PrintVerbose(_("Reading RPM DB...")); + CommandLine::PrintVerbose(_("Reading RPM database...")); } else { @@ -2237,7 +2237,7 @@ `Heading(`id(`label_scanDB_popup), `opt(`hstretch), _("Reading Installed Packages")), `HBox( // progress bar label - `ProgressBar (`id (`progress), _("Scanning RPM Database..."), 100, 0), + `ProgressBar (`id (`progress), _("Scanning RPM database..."), 100, 0), `HSpacing(1) /* TODO: allow Abort , @@ -2254,7 +2254,7 @@ } else { - Progress::Title(_("Scanning RPM Database...")); + Progress::Title(_("Scanning RPM database...")); } } } @@ -2396,7 +2396,7 @@ if (Mode::commandline()) { // status message (command line mode) - CommandLine::PrintVerbose(_("RPM DB read")); + CommandLine::PrintVerbose(_("RPM database read")); } else { Modified: trunk/yast2/library/packages/src/PackageLock.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageLock.ycp?rev=50997&r1=50996&r2=50997&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageLock.ycp (original) +++ trunk/yast2/library/packages/src/PackageLock.ycp Thu Sep 11 07:55:27 2008 @@ -89,8 +89,8 @@ _("Accessing the Package Management Failed"), Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question - _("Would you like to retry to access it, -continue without having access to the package management + _("Would you like to retry accessing the package manager, +continue without having access to package management, or abort? "), Label::RetryButton(), @@ -115,8 +115,7 @@ _("Accessing the Package Management Failed"), Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question -_("Would you like to abort or retry to access it? -"), +_("Would you like to abort or try again?\n"), Label::RetryButton(), Label::AbortButton(), // default is 'Retry' Modified: trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp?rev=50997&r1=50996&r2=50997&view=diff ============================================================================== --- trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp (original) +++ trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp Thu Sep 11 07:55:27 2008 @@ -710,8 +710,8 @@ // warning label - the key to import is expired // %1 is current date (formatted according to the current locale) - exp_str = "\n" + sformat(_("WARNING: The key is expired! -Current date: %1"), current_date); + exp_str = "\n" + sformat(_("WARNING: The key has expired! +Expiry date: %1"), current_date); } // popup message, %1 stands for GPG key complete multiline description, %2 for key location (URL or ...) Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=50997&r1=50996&r2=50997&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Sep 11 07:55:27 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 11 07:55:19 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Wed Sep 10 14:47:48 CEST 2008 - aschnell@suse.de - allow whitespace at line-end in /etc/fstab (see bnc #401521) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org