- texts update after proof-reading

diff --git a/src/zypp-checkpatches.cc b/src/zypp-checkpatches.cc
index 8a55c6c..629171f 100644 (file)
--- a/src/zypp-checkpatches.cc
+++ b/src/zypp-checkpatches.cc
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
   catch ( const ZYppFactoryException & excpt_r )
   {
     ZYPP_CAUGHT (excpt_r);
-    string error_str( _("The updater could not access the package manager engine. This usually happens when you have another application (like YaST) using it at the same time. Please close other applications and check again for updates." ) );
+    string error_str( _("The updater could not access the package manager engine. This usually happens when you have another application (like YaST) using it at the same time. Please close the other applications and check again for updates." ) );
     return exit_with_error( error_str );
   }
   catch ( const Exception & excpt_r)

diff --git a/src/zypper-keyring-callbacks.h b/src/zypper-keyring-callbacks.h
index 8469d76..6b488ea 100644 (file)
--- a/src/zypper-keyring-callbacks.h
+++ b/src/zypper-keyring-callbacks.h
@@ -118,7 +118,7 @@ namespace zypp {
         std::string question = boost::str(boost::format(
             _("Signature verification failed for %s"
               " with public key id %s, %s, fingerprint %s."
-              " Warning: this might be caused by a malicious change in the file!"
+              " Warning: This might be caused by a malicious change in the file!"
               " Continuing is risky! Continue anyway?"))
             % file % keyid % keyname % fingerprint);
         return read_bool_answer(question, false);

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index c31e965..b92c54f 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -1388,12 +1388,12 @@ int solve_and_commit () {
         // special handling for failed integrity exception
         if (excpt_r.msg().find("fails integrity check") != string::npos) {
           cerr << endl
-            << _("Package integrity check failed. This may be a problem"
-            " with repository or media. Try one of the following:\n"
+            << _("The package integrity check failed. This may be a problem"
+            " with the repository or media. Try one of the following:\n"
             "\n"
             "- just retry previous command\n"
-            "- refresh repositories using 'zypper refresh'\n"
-            "- use another installation media (if e.g. damaged)\n"
+            "- refresh the repositories using 'zypper refresh'\n"
+            "- use another installation medium (if e.g. damaged)\n"
             "- use another repository") << endl;
           return ZYPPER_EXIT_ERR_ZYPP;
         }
@@ -1406,21 +1406,21 @@ int solve_and_commit () {
   if (retv < 0)
     retv = ZYPPER_EXIT_OK;
   else if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED)
-       {
-               if (gSettings.machine_readable)
-           cout << "<message type=\"warning\" text=\"" << _("One of installed patches requires reboot of"
-             " your machine. Please, do it as soon as possible.") << "\">" << endl;
-               else
-           cout << _("WARNING: One of installed patches requires reboot of"
-             " your machine. Please, do it as soon as possible.") << endl;
-       }
+  {
+    if (gSettings.machine_readable)
+      cout << "<message type=\"warning\" text=\"" << _("One of installed patches requires reboot of"
+          " your machine. Please, do it as soon as possible.") << "\">" << endl;
+    else
+      cout << _("WARNING: One of installed patches requires a reboot of"
+          " your machine. Please do it as soon as possible.") << endl;
+  }
   else if (retv == ZYPPER_EXIT_INF_RESTART_NEEDED)
-       {
-               if (!gSettings.machine_readable)
-                       cout << _("WARNING: One of installed patches affects the package"
-      " manager itself, thus it requires restart before executing"
-      " next operations.") << endl;
-       }
+  {
+    if (!gSettings.machine_readable)
+      cout << _("WARNING: One of installed patches affects the package"
+          " manager itself, thus it requires its restart before executing"
+          " any further operations.") << endl;
+  }
 
   return retv;
 }
@@ -1467,13 +1467,14 @@ bool confirm_licenses()
 
         if (gSettings.non_interactive)
         {
+          //! \todo do this with _PL()
           cout << endl <<
-             _("Aborting installation due to the need of"
+             _("Aborting installation due to the need for"
               " license(s) confirmation.") << " ";
           // TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
           // it is a command line option
           cout << _("Please, restart the operation in interactive"
-              " mode and confirm agreement with required license(s),"
+              " mode and confirm your agreement with required license(s),"
               " or use the --auto-agree-with-licenses option.")
             << endl;
           MIL << "License(s) NOT confirmed (non-interactive without auto confirmation)" << endl;

diff --git a/src/zypper-search.cc b/src/zypper-search.cc
index 5192493..862bec4 100644 (file)
--- a/src/zypper-search.cc
+++ b/src/zypper-search.cc
@@ -39,8 +39,8 @@ ZyppSearch::ZyppSearch (
 #if 0
   // no repos warning
   if (gData.repos.empty()) {
-    cerr << _("No repositories configured. Please, add at least one"
-              " repository using 'zypper addrepo' command before using search.")
+    cerr << _("No repositories configured. Please add at least one"
+              " repository using 'zypper addrepo' command before using the search.")
          << endl;
     exit(ZYPPER_EXIT_NO_REPOS); // TODO #define zypper error codes?
   }

diff --git a/src/zypper-sources.cc b/src/zypper-sources.cc
index d91a7f0..c7d4f09 100644 (file)
--- a/src/zypper-sources.cc
+++ b/src/zypper-sources.cc
@@ -330,7 +330,7 @@ static void print_repo_list( const std::list<zypp::RepoInfo> &repos )
 
   if (tbl.empty())
     cout_n << _("No repositories defined."
-        " Use 'zypper addrepo' command to add one or more repositories.")
+        " Use the 'zypper addrepo' command to add one or more repositories.")
          << endl;
   else
     cout << tbl;
@@ -568,7 +568,7 @@ int refresh_repos(vector<string> & arguments)
   else if (error_count == enabled_repo_count)
     cerr << _("Could not refresh the repositories because of errors.") << endl;
   else if (error_count)
-    cerr << _("Some of the repositories have not been refreshed because of error.") << endl;
+    cerr << _("Some of the repositories have not been refreshed because of an error.") << endl;
   else if (argc)
     cout << _("Specified repositories have been refreshed.") << endl;
   else
@@ -647,9 +647,9 @@ int add_repo(RepoInfo & repo)
   {
     ZYPP_CAUGHT(e);
     report_problem(e,
-        _("Problem transfering repository data from specified URL:"),
+        _("Problem transferring repository data from specified URL:"),
         _("Please, check whether the specified URL is accessible."));
-    ERR << "Problem transfering repository data from specified URL" << endl;
+    ERR << "Problem transferring repository data from specified URL" << endl;
     return ZYPPER_EXIT_ERR_ZYPP;
   }
   catch (const Exception & e)

diff --git a/src/zypper.cc b/src/zypper.cc
index 66679df..cb083ed 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -348,7 +348,7 @@ int one_command(int argc, char **argv)
     specific_help = _(
       "addrepo (ar) [options] <URI> <alias>\n"
       "\n"
-      "Add repository specified by URI to the system and assing specified alias to it.\n"
+      "Add repository specified by URI to the system and assing the specified alias to it.\n"
       "\n"
       "  Command options:\n"
       "-r, --repo <FILE.repo>  Read the URL and alias from a file (even remote)\n"
@@ -530,13 +530,13 @@ int one_command(int argc, char **argv)
     specific_help = _(
       "search [options] [querystring...]\n"
       "\n"
-      "'search' - Search for packages matching given search strings\n"
+      "Search for packages matching given search strings\n"
       "\n"
       "  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-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-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"
@@ -688,7 +688,7 @@ int one_command(int argc, char **argv)
   {
     MIL << "Repositories disabled, using target only." << endl;
     cout_n <<
-        _("Repositories disabled, using database of installed packages only.")
+        _("Repositories disabled, using the database of installed packages only.")
         << endl;
     gSettings.disable_system_sources = true;
   }
@@ -726,7 +726,7 @@ int one_command(int argc, char **argv)
     ZYPP_CAUGHT (excpt_r);
     ERR  << "A ZYpp transaction is already in progress." << endl;
     string msg = _("A ZYpp transaction is already in progress."
-        " This means, there is another application using libzypp library for"
+        " This means, there is another application using the libzypp library for"
         " package management running. All such applications must be closed before"
         " using this command.");