- some text corrections

diff --git a/src/callbacks/keyring.h b/src/callbacks/keyring.h
index e53e083..193a78e 100644 (file)
--- a/src/callbacks/keyring.h
+++ b/src/callbacks/keyring.h
@@ -124,7 +124,7 @@ namespace zypp
         if (_gopts.no_gpg_checks)
           s << _("Automatically trusting the following key:") << std::endl;
         else
-          s << _("New repository or package signing key receieved:") << std::endl;
+          s << _("New repository or package signing key received:") << std::endl;
 
         // gpg key info
         s
@@ -146,19 +146,28 @@ namespace zypp
 
         // ask the user
         s << std::endl;
-        s << _("Do you want to trust key?");
+        s << _("Do you want to trust the key?");
 
         // only root has access to rpm db where keys are stored
         bool canimport = geteuid() == 0 || _gopts.changedRoot;
 
         PromptOptions popts;
         if (canimport)
+          // translators: n/t/i stands for doNttrust/TrustTemporarily/Import
+          // translate to whatever is appropriate for your language
+          // The anserws must be separated by slash characters '/' and must
+          // correspond to donttrust/trusttemporarily/import in that order.
+          // The answers should be lower case letters.
           popts.setOptions(_("n/t/i"), 0);
         else
+          // translators: the same as n/t/i, but without 'i'
           popts.setOptions(_("n/t"), 0);
+        // translators: help text for the 'n' option in the 'n/t/i' prompt
         popts.setOptionHelp(0, _("Don't trust the key."));
+        // translators: help text for the 't' option in the 'n/t/i' prompt
         popts.setOptionHelp(1, _("Trust the key temporarily."));
         if (canimport)
+          // translators: help text for the 'i' option in the 'n/t/i' prompt
           popts.setOptionHelp(2, _("Trust the key and import it into trusted keyring."));
 
         zypper.out().prompt(PROMPT_YN_GPG_KEY_TRUST, s.str(), popts);
@@ -197,7 +206,7 @@ namespace zypp
           else
             msg << boost::format(
                 _("Ignoring failed signature verification for file '%s'"
-                  " from repository '%s')!")) % file % context.repoInfo().name();
+                  " from repository '%s'!")) % file % context.repoInfo().name();
 
           msg
             << std::endl

diff --git a/src/misc.cc b/src/misc.cc
index cd49379..0f1889e 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -281,9 +281,9 @@ void report_licenses(Zypper & zypper)
   }
 
   cout << endl << _("SUMMARY") << endl << endl;
-  cout << _("Installed packages: ") << count_installed << endl;
-  cout << _("Installed packages with counterparts in repositories: ") << count_installed_repo << endl;
-  cout << _("Installed packages with EULAs: ") << count_installed_eula << endl;
+  cout << str::form(_("Installed packages: %d"), count_installed) << endl;
+  cout << str::form(_("Installed packages with counterparts in repositories: %d"), count_installed_repo) << endl;
+  cout << str::form(_("Installed packages with EULAs: %d"), count_installed_eula) << endl;
 
   cout << str::form("Package licenses (%u):", (unsigned int) unique_licenses.size()) << endl;
   for_(it, unique_licenses.begin(), unique_licenses.end())

diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index d0df51c..bd06cae 100755 (executable)
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -1019,6 +1019,10 @@ void solve_and_commit (Zypper & zypper)
         // translators: Yes / No / show Problems. This prompt will appear
         // after install/update command summary if there will be any package
         // to-be-removed automatically to show why, if asked.
+        // Translate to whathever is suitable for your language
+        // The anserws must be separated by slash characters '/' and must
+        // correspond to yes/no/showproblems in that order.
+        // The answers should be lower case letters.
         popts.setOptions(_("y/n/p"), 0);
         // translators: help text for 'y' option in the y/n/p prompt
         popts.setOptionHelp(0, _("Accept the summary and proceed with installation/removal of packages."));