- texts update from SP2 proof-reading

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index ad2f875..95b36de 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -1158,7 +1158,7 @@ static void list_patch_updates(Zypper & zypper, bool best_effort)
     if (!tbl.empty ())
       zypper.out().warning(
         _("These are only the updates affecting the updater itself.\n"
-          "There are others available too.\n"));
+          "Other updates are available too.\n"));
     tbl = pm_tbl;
   }
 
@@ -1646,7 +1646,7 @@ void solve_and_commit (Zypper & zypper)
     if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED)
       zypper.out().warning(
         _("One of installed patches requires reboot of"
-          " your machine. Please do it as soon as possible."));
+          " your machine. Reboot as soon as possible."));
     else if (retv == ZYPPER_EXIT_INF_RESTART_NEEDED)
       zypper.out().warning(
         _("One of installed patches affects the package"

diff --git a/src/zypper.cc b/src/zypper.cc
index 02cc69d..0430299 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -144,12 +144,12 @@ void print_main_help(Zypper & zypper)
     "\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--reposd-dir, -D <dir>\tUse alternative repository definition files directory.\n"
     "\t--cache-dir, -C <dir>\tUse alternative meta-data cache database directory.\n"
     "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory\n"
   );
-  
+
   static string help_global_source_options = _(
     "\tRepository Options:\n"
     "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
@@ -324,7 +324,7 @@ void Zypper::processGlobalOptions()
 
   if (gopts.count("no-gpg-checks")) {
     _gopts.no_gpg_checks = true;
-    out().info(_("Entering no-gpg-checks mode."), Out::HIGH);
+    out().info(_("Entering 'no-gpg-checks' mode."), Out::HIGH);
     MIL << "Entering no-gpg-checks mode" << endl;
   }
 
@@ -1139,8 +1139,8 @@ void Zypper::processCommandOptions()
       "  Command options:\n"
       "    --match-all            Search for a match with all search strings (default)\n"
       "    --match-any            Search for a match with any of the search strings\n"
-      "    --match-substrings     Matches with search strings may be partial words (default)\n"
-      "    --match-words          Matches with 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"