summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-01-28 17:39:37 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-01-28 17:39:37 +0100
commit236527f0fffe30fc8988e17d926778c23ac1f902 (patch)
treebf4f98bbb862e845e9b9ba9066c9f337c0aabc0d
parent28dbfcdc3a00a5ad20cf0a0b17cea3c842aaf983 (diff)
LP: #263089
-rw-r--r--apt-pkg/deb/debsystem.cc10
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog2
-rw-r--r--methods/gpgv.cc2
4 files changed, 9 insertions, 7 deletions
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index e1aacdbdb..ee2039c75 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -18,7 +18,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apti18n.h>
-
+
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>
@@ -67,11 +67,11 @@ bool debSystem::Lock()
if (LockFD == -1)
{
if (errno == EACCES || errno == EAGAIN)
- return _error->Error("Unable to lock the administration directory (%s), "
- "is another process using it?",AdminDir.c_str());
+ return _error->Error(_("Unable to lock the administration directory (%s), "
+ "is another process using it?"),AdminDir.c_str());
else
- return _error->Error("Unable to lock the administration directory (%s), "
- "are you root?",AdminDir.c_str());
+ return _error->Error(_("Unable to lock the administration directory (%s), "
+ "are you root?"),AdminDir.c_str());
}
// See if we need to abort with a dirty journal
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d5869da43..38775f70d 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1297,7 +1297,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
// show name mismatches
if (IsMatch == true && Parse->Package() != Src)
- ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package(), Src);
+ ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str());
if (VerTag.empty() == false)
{
diff --git a/debian/changelog b/debian/changelog
index 2c4802e3b..478638a63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ apt (0.7.19ubuntu3) jaunty; urgency=low
* debian/apt.conf.autoremove:
- readd "linux-image" (and friends) to the auto-remove
blacklist
+ * fix some i18n issues (thanks to Gabor Kelemen)
+ LP: #263089
[ Christian Perrier ]
* Translations:
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 9f4683e6e..f3277b300 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -264,7 +264,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
// least one bad signature. good signatures and NoPubKey signatures
// happen easily when a file is signed with multiple signatures
if(GoodSigners.empty() or !BadSigners.empty())
- return _error->Error(errmsg.c_str());
+ return _error->Error("%s", errmsg.c_str());
}
// Just pass the raw output up, because passing it as a real data