Author: jkupec Date: Thu Feb 28 12:20:52 2008 New Revision: 8943 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8943&view=rev Log: - texts correction based on proof-reading Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h?rev=8943&r1=8942&r2=8943&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h Thu Feb 28 12:20:52 2008 @@ -119,7 +119,7 @@ cerr << boost::format( _("Warning: Ignoring failed signature verification for %s" " with public key id %s, %s, fingerprint %s!" - " Double-check this is not caused by some malicious" + " Make sure this is not caused by some malicious" " changes in the file!")) %file % keyid % keyname % fingerprint << endl; return true; Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc?rev=8943&r1=8942&r2=8943&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc Thu Feb 28 12:20:52 2008 @@ -558,8 +558,7 @@ if (!pm_tbl.empty ()) { if (!tbl.empty ()) { cerr << _("WARNING: These are only the updates affecting the updater itself.\n" - "There are others available too.\n") << flush; - + "Other updates are available too.\n") << flush; } tbl = pm_tbl; } @@ -781,11 +780,11 @@ if (excpt_r.msg().find("fails integrity check") != string::npos) { cerr << endl << _("Package integrity check failed. This may be a problem" - " with installation source or media. Try one of the following:\n" + " with the installation source or media. Try one of the following:\n" "\n" - "- just retry previous command\n" + "- retry previous command\n" "- refresh installation sources using 'zypper refresh'\n" - "- use another installation media (if e.g. damaged)\n" + "- use another installation media (for example, if yours is damaged)\n" "- use another installation source") << endl; return ZYPPER_EXIT_ERR_ZYPP; } @@ -799,7 +798,7 @@ retv = ZYPPER_EXIT_OK; else if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED) cout << _("WARNING: One of installed patches requires reboot of" - " your machine. Please, do it as soon as possible.") << endl; + " your machine. Reboot as soon as possible.") << endl; else if (retv == ZYPPER_EXIT_INF_RESTART_NEEDED) cout << _("WARNING: One of installed patches affects the package" " manager itself, thus it requires restart before executing" Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc?rev=8943&r1=8942&r2=8943&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc Thu Feb 28 12:20:52 2008 @@ -77,7 +77,7 @@ } catch( const Exception & excpt_r ) { - cerr << _("Can't access repository") << endl; + cerr << _("Cannot access repository") << endl; ZYPP_CAUGHT( excpt_r ); exit(-1); } Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc?rev=8943&r1=8942&r2=8943&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc Thu Feb 28 12:20:52 2008 @@ -210,7 +210,7 @@ { // TranslatorExplanation %s = detailed low level (unstranslated) error message string error = excpt_r.msg(); - gData.errors.push_back(str::form(_("Couldn't restore source.\nDetail: %s"), error.c_str())); + gData.errors.push_back(str::form(_("Could not restore source.\nDetail: %s"), error.c_str())); } } Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc?rev=8943&r1=8942&r2=8943&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc Thu Feb 28 12:20:52 2008 @@ -43,7 +43,7 @@ // no sources warning if (gData.sources.empty()) { cerr << _("No sources. Zypper currently searches within installation" - "sources only.") << endl; + " sources only.") << endl; exit(2); // TODO #define zypper error codes? } Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc?rev=8943&r1=8942&r2=8943&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc Thu Feb 28 12:20:52 2008 @@ -131,7 +131,7 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" - "\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n" + "\t--non-interactive, -n\tDo not ask anything, use default answers automatically.\n" "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" "\t--root, -R <dir>\tOperate on a different root directory\n"); @@ -149,7 +149,7 @@ if (gopts.count("no-gpg-checks")) { gSettings.no_gpg_checks = true; - cout << _("Entering no-gpg-checks mode.") << endl; + cout << _("Entering 'no-gpg-checks' mode.") << endl; MIL << "Entering no-gpg-checks mode" << endl; } @@ -409,8 +409,8 @@ " Command options:\n" " --match-all Search for a match to all search strings (default)\n" " --match-any Search for a match to any of the search strings\n" - " --match-substrings Matches for search strings may be partial words (default)\n" - " --match-words Matches for search strings may only be whole words\n" + " --match-substrings Search for a match to partial words (default)\n" + " --match-words Search for a match to whole words only\n" " --match-exact Searches for an exact package name\n" "-d, --search-descriptions Search also in package summaries and descriptions.\n" "-c, --case-sensitive Perform case-sensitive search.\n" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org