Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10689 - in /trunk/zypper/src: callbacks/repo.h output/OutNormal.cc repos.cc solve-commit.cc utils/misc.cc
  • From: jkupec@xxxxxxxxxxxxxxxx
  • Date: Tue, 29 Jul 2008 13:10:19 -0000
  • Message-id: <20080729131019.CBBC02E2D3@xxxxxxxxxxxxxxxx>
Author: jkupec
Date: Tue Jul 29 15:10:19 2008
New Revision: 10689

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10689&view=rev
Log:
- say Retrieving instead of Downloading when getting files (bnc #412851)

Modified:
trunk/zypper/src/callbacks/repo.h
trunk/zypper/src/output/OutNormal.cc
trunk/zypper/src/repos.cc
trunk/zypper/src/solve-commit.cc
trunk/zypper/src/utils/misc.cc

Modified: trunk/zypper/src/callbacks/repo.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/repo.h?rev=10689&r1=10688&r2=10689&view=diff
==============================================================================
--- trunk/zypper/src/callbacks/repo.h (original)
+++ trunk/zypper/src/callbacks/repo.h Tue Jul 29 15:10:19 2008
@@ -46,7 +46,7 @@
_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 @@
{
// 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 @@
_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 @@
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 @@
{
// 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;
}


Modified: trunk/zypper/src/output/OutNormal.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?rev=10689&r1=10688&r2=10689&view=diff
==============================================================================
--- trunk/zypper/src/output/OutNormal.cc (original)
+++ trunk/zypper/src/output/OutNormal.cc Tue Jul 29 15:10:19 2008
@@ -162,9 +162,9 @@

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 @@
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 @@

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

Modified: trunk/zypper/src/repos.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=10689&r1=10688&r2=10689&view=diff
==============================================================================
--- trunk/zypper/src/repos.cc (original)
+++ trunk/zypper/src/repos.cc Tue Jul 29 15:10:19 2008
@@ -122,7 +122,7 @@
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 @@
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 @@
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 @@
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);

Modified: trunk/zypper/src/solve-commit.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/solve-commit.cc?rev=10689&r1=10688&r2=10689&view=diff
==============================================================================
--- trunk/zypper/src/solve-commit.cc (original)
+++ trunk/zypper/src/solve-commit.cc Tue Jul 29 15:10:19 2008
@@ -1061,7 +1061,7 @@
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 @@
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;

Modified: trunk/zypper/src/utils/misc.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/misc.cc?rev=10689&r1=10688&r2=10689&view=diff
==============================================================================
--- trunk/zypper/src/utils/misc.cc (original)
+++ trunk/zypper/src/utils/misc.cc Tue Jul 29 15:10:19 2008
@@ -236,7 +236,7 @@
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."));
}


--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages