LP: #263089

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index e1aacdbdbd5b7212f8893bcfb05ab2a27c7d1c69..ee2039c7531e4bbeb016361b8d3e992efba8bf9c 100644 (file)
--- 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 <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apti18n.h>

-    
+

 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.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)
    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
       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
    }
    
    // See if we need to abort with a dirty journal

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d5869da43a768606ffc62295623ad3a388807450..38775f70d70afbf166151e4c7d00a37e6ae1b846 100644 (file)
--- 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) 
       
       // 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)
       {
       
       if (VerTag.empty() == false)
       {

diff --git a/debian/changelog b/debian/changelog
index 2c4802e3b9221ec125b2dad6802f29ad80aa30d0..478638a63a28eebf3f0d3fc809d466b93036b9e0 100644 (file)
--- 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
  * 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:
 
   [ Christian Perrier ]
   * Translations:

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 9f4683e6e05f2522a6934faaccb6e0de15c4f5dd..f3277b300e1dab03659c7c0c242d9b1a9c18879e 100644 (file)
--- 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())
       // 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
    }
       
    // Just pass the raw output up, because passing it as a real data