- say Retrieving instead of Downloading when getting files (bnc #412851)

diff --git a/src/callbacks/repo.h b/src/callbacks/repo.h
index d126f9b..11d6bbc 100644 (file)
--- a/src/callbacks/repo.h
+++ b/src/callbacks/repo.h
@@ -46,7 +46,7 @@ struct DownloadResolvableReportReceiver : public zypp::callback::ReceiveReport<z
     _delta = filename;
     _delta_size = downloadsize;
     std::ostringstream s;
-    s << _("Downloading delta") << ": "
+    s << _("Retrieving delta") << ": "
         << _delta << ", " << _delta_size;
     Zypper::instance()->out().info(s.str());
   }
@@ -55,8 +55,8 @@ struct DownloadResolvableReportReceiver : public zypp::callback::ReceiveReport<z
   {
     // seems this is never called, the progress is reported by the media backend anyway
     INT << "not impelmented" << std::endl;
-    // TranslatorExplanation This text is a progress display label e.g. "Downloading delta [42%]"
-    //display_step( "apply-delta", ~("Downloading delta") /*+ _delta.asString()*/, value );
+    // TranslatorExplanation This text is a progress display label e.g. "Retrieving delta [42%]"
+    //display_step( "apply-delta", ~("Retrieving delta") /*+ _delta.asString()*/, value );
     return true;
   }
 
@@ -112,7 +112,7 @@ struct DownloadResolvableReportReceiver : public zypp::callback::ReceiveReport<z
     _patch = filename.basename();
     _patch_size = downloadsize;
     std::ostringstream s;
-    s << _("Downloading patch rpm") << ": " << _patch << ", " << _patch_size;
+    s << _("Retrieving patch rpm") << ": " << _patch << ", " << _patch_size;
     Zypper::instance()->out().info(s.str());
   }
 
@@ -149,7 +149,7 @@ struct DownloadResolvableReportReceiver : public zypp::callback::ReceiveReport<z
     Zypper & zypper = *Zypper::instance();
 
     std::ostringstream s;
-    s << boost::format(_("Downloading %s %s-%s.%s"))
+    s << boost::format(_("Retrieving %s %s-%s.%s"))
         % kind_to_string_localized(_resolvable_ptr->kind(), 1)
         % _resolvable_ptr->name()
         % _resolvable_ptr->edition() % _resolvable_ptr->arch();
@@ -174,8 +174,8 @@ struct DownloadResolvableReportReceiver : public zypp::callback::ReceiveReport<z
   {
     // seems this is never called, the progress is reported by the media backend anyway
     INT << "not impelmented" << std::endl;
-    // TranslatorExplanation This text is a progress display label e.g. "Downloading [42%]"
-//    display_step( "download-resolvable", ~("Downloading") /* + resolvable_ptr->name() */, value );
+    // TranslatorExplanation This text is a progress display label e.g. "Retrieving [42%]"
+//    display_step( "download-resolvable", ~("Retrieving") /* + resolvable_ptr->name() */, value );
     return true;
   }
 

diff --git a/src/output/OutNormal.cc b/src/output/OutNormal.cc
index 0cb9aa3..40199d6 100644 (file)
--- a/src/output/OutNormal.cc
+++ b/src/output/OutNormal.cc
@@ -162,9 +162,9 @@ void OutNormal::dwnldProgressStart(const zypp::Url & uri)
 
   static AliveCursor cursor;
   if (isatty(STDOUT_FILENO))
-    cout << CLEARLN << ++cursor << " " << _("Downloading:") << " ";
+    cout << CLEARLN << ++cursor << " " << _("Retrieving:") << " ";
   else
-    cout << _("Downloading:") << " ";
+    cout << _("Retrieving:") << " ";
   if (verbosity() == DEBUG)
     cout << uri; //! \todo shorten to fit the width of the terminal
   else
@@ -188,7 +188,7 @@ void OutNormal::dwnldProgress(const zypp::Url & uri,
     return;
   }
 
-  cout << CLEARLN << _("Downloading:") << " ";
+  cout << CLEARLN << _("Retrieving:") << " ";
   if (verbosity() == DEBUG)
     cout << uri; //! \todo shorten to fit the width of the terminal
   else
@@ -214,7 +214,7 @@ void OutNormal::dwnldProgressEnd(const zypp::Url & uri, long rate, bool error)
 
   if (isatty(STDOUT_FILENO))
   {
-    cout << CLEARLN << _("Downloading:") << " ";
+    cout << CLEARLN << _("Retrieving:") << " ";
     if (verbosity() == DEBUG)
       cout << uri; //! \todo shorten to fit the width of the terminal
     else

diff --git a/src/repos.cc b/src/repos.cc
index ff2c2e7..5df8e8a 100644 (file)
--- a/src/repos.cc
+++ b/src/repos.cc
@@ -122,7 +122,7 @@ static bool refresh_raw_metadata(Zypper & zypper,
     if (do_refresh)
     {
       plabel = str::form(
-          _("Downloading repository '%s' metadata"), repo.name().c_str());
+          _("Retrieving repository '%s' metadata"), repo.name().c_str());
       zypper.out().progressStart("raw-refresh", plabel, true);
 
       manager.refreshMetadata(repo,
@@ -145,7 +145,7 @@ static bool refresh_raw_metadata(Zypper & zypper,
       plabel.clear();
     }
     zypper.out().error(e,
-        boost::str(format(_("Problem downloading files from '%s'.")) % repo.name()),
+        boost::str(format(_("Problem retrieving files from '%s'.")) % repo.name()),
         _("Please see the above error message for a hint."));
 
     return true; // error
@@ -203,7 +203,7 @@ static bool refresh_raw_metadata(Zypper & zypper,
       plabel.clear();
     }
     zypper.out().error(e,
-        boost::str(format(_("Error downloading metadata for '%s':")) % repo.name()));
+        boost::str(format(_("Error retrieving metadata for '%s':")) % repo.name()));
     // log untranslated message
     ERR << format("Error reading repository '%s':") % repo.name() << endl;
 
@@ -2027,7 +2027,7 @@ void refresh_services(Zypper & zypper)
       ZYPP_CAUGHT(e);
       zypper.out().error(e,
         str::form(
-          _("Problem downloading the repository index file for service '%s':"),
+          _("Problem retrieving the repository index file for service '%s':"),
           s.name().c_str()),
         _("Check if the URI is valid and accessible."));
       zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);

diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index e9a5666..f424203 100755 (executable)
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -1061,7 +1061,7 @@ void solve_and_commit (Zypper & zypper)
           catch ( const media::MediaException & e ) {
             ZYPP_CAUGHT(e);
             zypper.out().error(e,
-                _("Problem downloading the package file from the repository:"),
+                _("Problem retrieving the package file from the repository:"),
                 _("Please see the above error message for a hint."));
             zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);
             return;
@@ -1095,7 +1095,7 @@ void solve_and_commit (Zypper & zypper)
                   e.info().alias() % "zypper refresh" );
             }
             zypper.out().error(e,
-                _("Problem downloading the package file from the repository:"),
+                _("Problem retrieving the package file from the repository:"),
                 hint);
             zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);
             return;

diff --git a/src/utils/misc.cc b/src/utils/misc.cc
index fefc54d..1f22214 100644 (file)
--- a/src/utils/misc.cc
+++ b/src/utils/misc.cc
@@ -236,7 +236,7 @@ Pathname cache_rpm(const string & rpm_uri_str, const string & cache_dir)
   catch (const Exception & e)
   {
     Zypper::instance()->out().error(e,
-        _("Problem downloading the specified RPM file") + string(":"),
+        _("Problem retrieving the specified RPM file") + string(":"),
         _("Please check whether the file is accessible."));
   }