merged debian/sid branch from git.debian.org

127 files changed, 18628 insertions, 17878 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index c33445b56..000000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[BUILDDEB]
-native = true
-
-[HOOKS]
-pre-export = ./prepare-release pre-export
-post-build = ./prepare-release post-build
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3e07e241b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+# build artifacts
+/aclocal.m4
+/autom4te.cache/
+/build/
+/buildlib/config.guess
+/buildlib/config.sub
+/configure
+
+# copy of COPYING
+/debian/copyright
+
+# generated files in the process to build all
+# apt man pages and other documentation
+/doc/*/
+!/doc/examples/
+!/doc/po/
+!/doc/en/makefile
+
+# package building artifacts
+/debian/*.log
+/debian/*.substvars
+/debian/*.debhelper
+/debian/files
+/debian/apt/
+/debian/apt-doc/
+/debian/apt-utils/
+/debian/libapt-pkg*/
+/debian/libapt-inst*/
+/debian/libapt-pkg-dev/
+/debian/libapt-pkg-doc/
+/debian/apt-transport-https/
+
+# generated from *.in files
+/doc/examples/sources.list
+/debian/libapt-pkg*.install
+/debian/libapt-inst*.install
+/debian/libapt-pkg-dev.install
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 2dee1a40d..d7ee528ba 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -106,7 +106,10 @@ bool ARArchive::LoadHeaders()
 	    return _error->Error(_("Invalid archive member header"));
 	 }
 	 if (File.Read(S,Len) == false)
+	 {
+	    delete Memb;
 	    return false;
+	 }
 	 S[Len] = 0;
 	 Memb->Name = S;
 	 Memb->Size -= Len;
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 806ba796d..49ed5db56 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -63,7 +63,6 @@ ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram)
 
 {
    GZPid = -1;
-   InFd = -1;
    Eof = false;
 }
 									/*}}}*/
diff --git a/apt-inst/makefile b/apt-inst/makefile
index cfb22741a..da983df5f 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -18,6 +18,7 @@ MAJOR=1.5
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)
+LIBRARYDEPENDS=$(LIB)/libapt-pkg.so
 
 # Source code for the contributed non-core things
 SOURCE = contrib/extracttar.cc contrib/arfile.cc
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a79dfb727..46e4a7065 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1300,7 +1300,14 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)			/*{{{*/
       string FinalFile = _config->FindDir("Dir::State::lists");
       FinalFile += URItoFileName(RealURI);
       if (SigFile == DestFile)
+      {
 	 SigFile = FinalFile;
+	 // constructor of pkgAcqMetaClearSig moved it out of the way,
+	 // now move it back in on IMS hit for the 'old' file
+	 string const OldClearSig = DestFile + ".reverify";
+	 if (RealFileExists(OldClearSig) == true)
+	    Rename(OldClearSig, FinalFile);
+      }
       DestFile = FinalFile;
    }
    Complete = true;
@@ -1606,7 +1613,11 @@ string pkgAcqMetaClearSig::Custom600Headers()
 
    struct stat Buf;
    if (stat(Final.c_str(),&Buf) != 0)
-      return "\nIndex-File: true\nFail-Ignore: true\n";
+   {
+      Final = DestFile + ".reverify";
+      if (stat(Final.c_str(),&Buf) != 0)
+	 return "\nIndex-File: true\nFail-Ignore: true\n";
+   }
 
    return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 9d90b08bc..44a84216a 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -305,7 +305,15 @@ bool pkgAcquire::Worker::RunMessages()
 	    
 	    OwnerQ->ItemDone(Itm);
 	    unsigned long long const ServerSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
-	    if (TotalSize != 0 && ServerSize != TotalSize)
+            bool isHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
+                         StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
+            // Using the https method the server might return 200, but the
+            // If-Modified-Since condition is not satsified, libcurl will
+            // discard the download. In this case, however, TotalSize will be
+            // set to the actual size of the file, while ServerSize will be set
+            // to 0. Therefore, if the item is marked as a hit and the
+            // downloaded size (ServerSize) is 0, we ignore TotalSize.
+	    if (TotalSize != 0 && (!isHit || ServerSize != 0) && ServerSize != TotalSize)
 	       _error->Warning("Size of file %s is not what the server reported %s %llu",
 			       Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize);
 
@@ -332,8 +340,7 @@ bool pkgAcquire::Worker::RunMessages()
 	    // Log that we are done
 	    if (Log != 0)
 	    {
-	       if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true ||
-		   StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
+	       if (isHit)
 	       {
 		  /* Hide 'hits' for local only sources - we also manage to
 		     hide gets */
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 7fcd9f0db..85799a11b 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -648,7 +648,10 @@ void pkgProblemResolver::MakeScores()
 	      D->Type != pkgCache::Dep::Recommends))
 	    continue;	 
 	 
-	 Scores[I->ID] += abs(OldScores[D.ParentPkg()->ID]);
+	 // Do not propagate negative scores otherwise
+	 // an extra (-2) package might score better than an optional (-1)
+	 if (OldScores[D.ParentPkg()->ID] > 0)
+	     Scores[I->ID] += OldScores[D.ParentPkg()->ID];
       }      
    }
 
@@ -842,8 +845,10 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
    }
    while (Again == true);
 
-   if (Debug == true)
-      clog << "Starting" << endl;
+   if (Debug == true) {
+      clog << "Starting pkgProblemResolver with broken count: " 
+           << Cache.BrokenCount() << endl;
+   }
    
    MakeScores();
 
@@ -871,8 +876,10 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
          }
    }
 
-   if (Debug == true)
-      clog << "Starting 2" << endl;
+   if (Debug == true) {
+      clog << "Starting 2 pkgProblemResolver with broken count: " 
+           << Cache.BrokenCount() << endl;
+   }
 
    /* Now consider all broken packages. For each broken package we either
       remove the package or fix it's problem. We do this once, it should
@@ -1437,9 +1444,11 @@ bool pkgProblemResolver::ResolveByKeepInternal()
    return true;
 }
 									/*}}}*/
-// ProblemResolver::InstallProtect - Install all protected packages	/*{{{*/
+// ProblemResolver::InstallProtect - deprecated cpu-eating no-op	/*{{{*/
 // ---------------------------------------------------------------------
-/* This is used to make sure protected packages are installed */
+/* Actions issued with FromUser bit set are protected from further
+   modification (expect by other calls with FromUser set) nowadays , so we
+   don't need to reissue actions here, they are already set in stone. */
 void pkgProblemResolver::InstallProtect()
 {
    pkgDepCache::ActionGroup group(Cache);
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index aff8a68f2..7f58c8eed 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -36,6 +36,8 @@
 
 #include <iostream>
 
+#include <apt-pkg/macros.h>
+
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
 using std::ostream;
@@ -132,9 +134,8 @@ class pkgProblemResolver						/*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
-   // Install all protected packages   
-   void InstallProtect();   
-   
+   __deprecated void InstallProtect();
+
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 9a9a854bf..a5668a50a 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -829,6 +829,14 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
       log->Update(msg.str());
       log->Update(_("Copying package lists..."), STEP_COPY);
    }
+
+   // check for existence and possibly create state directory for copying
+   string const listDir = _config->FindDir("Dir::State::lists");
+   string const partialListDir = listDir + "partial/";
+   if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
+       CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false)
+      return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str());
+
    // take care of the signatures and copy them if they are ok
    // (we do this before PackageCopy as it modifies "List" and "SourceList")
    SigVerify SignVerify;
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index 21c51c1be..7d09b2d4a 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -123,6 +123,25 @@ public:									/*{{{*/
 	bool InsertErrno(MsgType const &type, const char* Function,
 			 const char* Description,...) __like_printf(4) __cold;
 
+	/** \brief adds an errno message with the given type
+	 *
+	 * args needs to be initialized with va_start and terminated
+	 * with va_end by the caller. msgSize is also an out-parameter
+	 * in case the msgSize was not enough to store the complete message.
+	 *
+	 * \param type of the error message
+	 * \param Function which failed
+	 * \param Description is the format string for args
+	 * \param args list from a printf-like function
+	 * \param errsv is the errno the error is for
+	 * \param msgSize is the size of the char[] used to store message
+	 * \return true if the message was added, false if not - the caller
+	 * should call this method again in that case
+	 */
+	bool InsertErrno(MsgType type, const char* Function,
+			 const char* Description, va_list &args,
+			 int const errsv, size_t &msgSize);
+
 	/** \brief add an fatal error message to the list
 	 *
 	 *  Most of the stuff we consider as "error" is also "fatal" for
@@ -185,6 +204,22 @@ public:									/*{{{*/
 	 */
 	bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold;
 
+	/** \brief adds an error message with the given type
+	 *
+	 * args needs to be initialized with va_start and terminated
+	 * with va_end by the caller. msgSize is also an out-parameter
+	 * in case the msgSize was not enough to store the complete message.
+	 *
+	 * \param type of the error message
+	 * \param Description is the format string for args
+	 * \param args list from a printf-like function
+	 * \param msgSize is the size of the char[] used to store message
+	 * \return true if the message was added, false if not - the caller
+	 * should call this method again in that case
+	 */
+	bool Insert(MsgType type, const char* Description,
+			 va_list &args, size_t &msgSize) __cold;
+
 	/** \brief is an error in the list?
 	 *
 	 *  \return \b true if an error is included in the list, \b false otherwise
@@ -305,12 +340,6 @@ private:								/*{{{*/
 	};
 
 	std::list<MsgStack> Stacks;
-
-	bool InsertErrno(MsgType type, const char* Function,
-			 const char* Description, va_list &args,
-			 int const errsv, size_t &msgSize);
-	bool Insert(MsgType type, const char* Description,
-			 va_list &args, size_t &msgSize);
 									/*}}}*/
 };
 									/*}}}*/
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index c426293a3..61ff0031f 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -184,7 +184,8 @@ bool RunScripts(const char *Cnf)
 /* The caller is expected to set things so that failure causes erasure */
 bool CopyFile(FileFd &From,FileFd &To)
 {
-   if (From.IsOpen() == false || To.IsOpen() == false)
+   if (From.IsOpen() == false || To.IsOpen() == false ||
+	 From.Failed() == true || To.Failed() == true)
       return false;
    
    // Buffered copy between fds
@@ -881,7 +882,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
       return Open(FileName, ReadOnly, Gzip, Perms);
 
    if (Compress == Auto && (Mode & WriteOnly) == WriteOnly)
-      return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str());
+      return FileFdError("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str());
 
    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
@@ -934,17 +935,17 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress,
       case Auto:
       case Extension:
 	 // Unreachable
-	 return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str());
+	 return FileFdError("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str());
       }
       for (; compressor != compressors.end(); ++compressor)
 	 if (compressor->Name == name)
 	    break;
       if (compressor == compressors.end())
-	 return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
+	 return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
    }
 
    if (compressor == compressors.end())
-      return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str());
+      return FileFdError("Can't find a match for specified compressor mode for file %s", FileName.c_str());
    return Open(FileName, Mode, *compressor, Perms);
 }
 bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms)
@@ -953,9 +954,9 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
    Flags = AutoClose;
 
    if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0)
-      return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str());
+      return FileFdError("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str());
    if ((Mode & ReadWrite) == 0)
-      return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str());
+      return FileFdError("No openmode provided in FileFd::Open for %s", FileName.c_str());
 
    if ((Mode & Atomic) == Atomic)
    {
@@ -1001,7 +1002,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co
 	 close (iFd);
 	 iFd = -1;
       }
-      return _error->Errno("open",_("Could not open file %s"), FileName.c_str());
+      return FileFdErrno("open",_("Could not open file %s"), FileName.c_str());
    }
 
    SetCloseExec(iFd,true);
@@ -1030,14 +1031,19 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre
    case Xz: name = "xz"; break;
    case Auto:
    case Extension:
-      return _error->Error("Opening Fd %d in Auto or Extension compression mode is not supported", Fd);
+      if (AutoClose == true && Fd != -1)
+	 close(Fd);
+      return FileFdError("Opening Fd %d in Auto or Extension compression mode is not supported", Fd);
    }
    for (; compressor != compressors.end(); ++compressor)
       if (compressor->Name == name)
 	 break;
    if (compressor == compressors.end())
-      return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
-
+   {
+      if (AutoClose == true && Fd != -1)
+	 close(Fd);
+      return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str());
+   }
    return OpenDescriptor(Fd, Mode, *compressor, AutoClose);
 }
 bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose)
@@ -1059,11 +1065,21 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration:
    else
       iFd = Fd;
    this->FileName = "";
-   if (OpenInternDescriptor(Mode, compressor) == false)
+   if (Fd == -1 || OpenInternDescriptor(Mode, compressor) == false)
    {
-      if (AutoClose)
+      if (iFd != -1 && (
+#ifdef HAVE_ZLIB
+	compressor.Name == "gzip" ||
+#endif
+#ifdef HAVE_BZ2
+	compressor.Name == "bzip2" ||
+#endif
+	AutoClose == true))
+      {
 	 close (iFd);
-      return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd);
+	 iFd = -1;
+      }
+      return FileFdError(_("Could not open file descriptor %d"), Fd);
    }
    return true;
 }
@@ -1125,10 +1141,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
       ExecWait(d->compressor_pid, "FileFdCompressor", true);
 
    if ((Mode & ReadWrite) == ReadWrite)
-   {
-      Flags |= Fail;
-      return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str());
-   }
+      return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str());
 
    bool const Comp = (Mode & WriteOnly) == WriteOnly;
    if (Comp == false)
@@ -1151,10 +1164,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
    // Create a data pipe
    int Pipe[2] = {-1,-1};
    if (pipe(Pipe) != 0)
-   {
-      Flags |= Fail;
-      return _error->Errno("pipe",_("Failed to create subprocess IPC"));
-   }
+      return FileFdErrno("pipe",_("Failed to create subprocess IPC"));
    for (int J = 0; J != 2; J++)
       SetCloseExec(Pipe[J],true);
 
@@ -1264,14 +1274,13 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
       {
 	 if (errno == EINTR)
 	    continue;
-	 Flags |= Fail;
 #ifdef HAVE_ZLIB
 	 if (d != NULL && d->gz != NULL)
 	 {
 	    int err;
 	    char const * const errmsg = gzerror(d->gz, &err);
 	    if (err != Z_ERRNO)
-	       return _error->Error("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
+	       return FileFdError("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
 	 }
 #endif
 #ifdef HAVE_BZ2
@@ -1280,10 +1289,10 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 	    int err;
 	    char const * const errmsg = BZ2_bzerror(d->bz2, &err);
 	    if (err != BZ_IO_ERROR)
-	       return _error->Error("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg);
+	       return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg);
 	 }
 #endif
-	 return _error->Errno("read",_("Read error"));
+	 return FileFdErrno("read",_("Read error"));
       }
       
       To = (char *)To + Res;
@@ -1304,9 +1313,8 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
       Flags |= HitEof;
       return true;
    }
-   
-   Flags |= Fail;
-   return _error->Error(_("read, still have %llu to read but none left"), Size);
+
+   return FileFdError(_("read, still have %llu to read but none left"), Size);
 }
 									/*}}}*/
 // FileFd::ReadLine - Read a complete line from the file		/*{{{*/
@@ -1362,14 +1370,13 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 	 continue;
       if (Res < 0)
       {
-	 Flags |= Fail;
 #ifdef HAVE_ZLIB
 	 if (d != NULL && d->gz != NULL)
 	 {
 	    int err;
 	    char const * const errmsg = gzerror(d->gz, &err);
 	    if (err != Z_ERRNO)
-	       return _error->Error("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
+	       return FileFdError("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
 	 }
 #endif
 #ifdef HAVE_BZ2
@@ -1378,10 +1385,10 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 	    int err;
 	    char const * const errmsg = BZ2_bzerror(d->bz2, &err);
 	    if (err != BZ_IO_ERROR)
-	       return _error->Error("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
+	       return FileFdError("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
 	 }
 #endif
-	 return _error->Errno("write",_("Write error"));
+	 return FileFdErrno("write",_("Write error"));
       }
       
       From = (char *)From + Res;
@@ -1393,9 +1400,8 @@ bool FileFd::Write(const void *From,unsigned long long Size)
    
    if (Size == 0)
       return true;
-   
-   Flags |= Fail;
-   return _error->Error(_("write, still have %llu to write but couldn't"), Size);
+
+   return FileFdError(_("write, still have %llu to write but couldn't"), Size);
 }
 bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
 {
@@ -1439,13 +1445,13 @@ bool FileFd::Seek(unsigned long long To)
 	 return Skip(To - seekpos);
 
       if ((d->openmode & ReadOnly) != ReadOnly)
-      {
-	 Flags |= Fail;
-	 return _error->Error("Reopen is only implemented for read-only files!");
-      }
+	 return FileFdError("Reopen is only implemented for read-only files!");
 #ifdef HAVE_BZ2
-      if (d->bz2 != NULL)
-	 BZ2_bzclose(d->bz2);
+     if (d->bz2 != NULL) 
+     {
+	BZ2_bzclose(d->bz2);
+	d->bz2 = NULL;
+     }
 #endif
       if (iFd != -1)
 	 close(iFd);
@@ -1460,17 +1466,11 @@ bool FileFd::Seek(unsigned long long To)
 	    if (lseek(d->compressed_fd, 0, SEEK_SET) != 0)
 	       iFd = d->compressed_fd;
 	 if (iFd < 0)
-	 {
-	    Flags |= Fail;
-	    return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");
-	 }
+	    return FileFdError("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");
       }
 
       if (OpenInternDescriptor(d->openmode, d->compressor) == false)
-      {
-	 Flags |= Fail;
-	 return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str());
-      }
+	 return FileFdError("Seek on file %s because it couldn't be reopened", FileName.c_str());
 
       if (To != 0)
 	 return Skip(To);
@@ -1486,10 +1486,7 @@ bool FileFd::Seek(unsigned long long To)
 #endif
       res = lseek(iFd,To,SEEK_SET);
    if (res != (signed)To)
-   {
-      Flags |= Fail;
-      return _error->Error("Unable to seek to %llu", To);
-   }
+      return FileFdError("Unable to seek to %llu", To);
 
    if (d != NULL)
       d->seekpos = To;
@@ -1513,10 +1510,7 @@ bool FileFd::Skip(unsigned long long Over)
       {
 	 unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over);
 	 if (Read(buffer, toread) == false)
-	 {
-	    Flags |= Fail;
-	    return _error->Error("Unable to seek ahead %llu",Over);
-	 }
+	    return FileFdError("Unable to seek ahead %llu",Over);
 	 Over -= toread;
       }
       return true;
@@ -1530,10 +1524,7 @@ bool FileFd::Skip(unsigned long long Over)
 #endif
       res = lseek(iFd,Over,SEEK_CUR);
    if (res < 0)
-   {
-      Flags |= Fail;
-      return _error->Error("Unable to seek ahead %llu",Over);
-   }
+      return FileFdError("Unable to seek ahead %llu",Over);
    if (d != NULL)
       d->seekpos = res;
 
@@ -1547,17 +1538,11 @@ bool FileFd::Truncate(unsigned long long To)
 {
 #if defined HAVE_ZLIB || defined HAVE_BZ2
    if (d != NULL && (d->gz != NULL || d->bz2 != NULL))
-   {
-      Flags |= Fail;
-      return _error->Error("Truncating compressed files is not implemented (%s)", FileName.c_str());
-   }
+      return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str());
 #endif
    if (ftruncate(iFd,To) != 0)
-   {
-      Flags |= Fail;
-      return _error->Error("Unable to truncate to %llu",To);
-   }
-   
+      return FileFdError("Unable to truncate to %llu",To);
+
    return true;
 }
 									/*}}}*/
@@ -1585,10 +1570,7 @@ unsigned long long FileFd::Tell()
 #endif
      Res = lseek(iFd,0,SEEK_CUR);
    if (Res == (off_t)-1)
-   {
-      Flags |= Fail;
-      _error->Errno("lseek","Failed to determine the current file position");
-   }
+      FileFdErrno("lseek","Failed to determine the current file position");
    if (d != NULL)
       d->seekpos = Res;
    return Res;
@@ -1601,10 +1583,7 @@ unsigned long long FileFd::FileSize()
 {
    struct stat Buf;
    if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0)
-   {
-      Flags |= Fail;
-      return _error->Errno("fstat","Unable to determine the file size");
-   }
+      return FileFdErrno("fstat","Unable to determine the file size");
 
    // for compressor pipes st_size is undefined and at 'best' zero
    if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode))
@@ -1614,10 +1593,7 @@ unsigned long long FileFd::FileSize()
       if (d != NULL)
 	 d->pipe = true;
       if (stat(FileName.c_str(), &Buf) != 0)
-      {
-	 Flags |= Fail;
-	 return _error->Errno("stat","Unable to determine the file size");
-      }
+	 return FileFdErrno("stat","Unable to determine the file size");
    }
 
    return Buf.st_size;
@@ -1659,16 +1635,10 @@ unsigned long long FileFd::Size()
 	* bits of the file */
        // FIXME: Size for gz-files is limited by 32bitโ€ฆ no largefile support
        if (lseek(iFd, -4, SEEK_END) < 0)
-       {
-	  Flags |= Fail;
-	  return _error->Errno("lseek","Unable to seek to end of gzipped file");
-       }
+	  return FileFdErrno("lseek","Unable to seek to end of gzipped file");
        size = 0L;
        if (read(iFd, &size, 4) != 4)
-       {
-	  Flags |= Fail;
-	  return _error->Errno("read","Unable to read original size of gzipped file");
-       }
+	  return FileFdErrno("read","Unable to read original size of gzipped file");
 
 #ifdef WORDS_BIGENDIAN
        uint32_t tmp_size = size;
@@ -1678,10 +1648,7 @@ unsigned long long FileFd::Size()
 #endif
 
        if (lseek(iFd, oldPos, SEEK_SET) < 0)
-       {
-	  Flags |= Fail;
-	  return _error->Errno("lseek","Unable to seek in gzipped file");
-       }
+	  return FileFdErrno("lseek","Unable to seek in gzipped file");
 
        return size;
    }
@@ -1698,8 +1665,7 @@ time_t FileFd::ModificationTime()
    struct stat Buf;
    if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0)
    {
-      Flags |= Fail;
-      _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
+      FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
       return 0;
    }
 
@@ -1712,8 +1678,7 @@ time_t FileFd::ModificationTime()
 	 d->pipe = true;
       if (stat(FileName.c_str(), &Buf) != 0)
       {
-	 Flags |= Fail;
-	 _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
+	 FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
 	 return 0;
       }
    }
@@ -1769,11 +1734,40 @@ bool FileFd::Close()
 bool FileFd::Sync()
 {
    if (fsync(iFd) != 0)
+      return FileFdErrno("sync",_("Problem syncing the file"));
+   return true;
+}
+									/*}}}*/
+// FileFd::FileFdErrno - set Fail and call _error->Errno		*{{{*/
+bool FileFd::FileFdErrno(const char *Function, const char *Description,...)
+{
+   Flags |= Fail;
+   va_list args;
+   size_t msgSize = 400;
+   int const errsv = errno;
+   while (true)
    {
-      Flags |= Fail;
-      return _error->Errno("sync",_("Problem syncing the file"));
+      va_start(args,Description);
+      if (_error->InsertErrno(GlobalError::ERROR, Function, Description, args, errsv, msgSize) == false)
+	 break;
+      va_end(args);
    }
-   return true;
+   return false;
+}
+									/*}}}*/
+// FileFd::FileFdError - set Fail and call _error->Error		*{{{*/
+bool FileFd::FileFdError(const char *Description,...) {
+   Flags |= Fail;
+   va_list args;
+   size_t msgSize = 400;
+   while (true)
+   {
+      va_start(args,Description);
+      if (_error->Insert(GlobalError::ERROR, Description, args, msgSize) == false)
+	 break;
+      va_end(args);
+   }
+   return false;
 }
 									/*}}}*/
 
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 510b1c984..f8e30e6ea 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -149,6 +149,10 @@ class FileFd
    private:
    FileFdPrivate* d;
    bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
+
+   // private helpers to set Fail flag and call _error->Error
+   bool FileFdErrno(const char* Function, const char* Description,...) __like_printf(3) __cold;
+   bool FileFdError(const char* Description,...) __like_printf(2) __cold;
 };
 
 bool RunScripts(const char *Cnf);
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 31db7d5fe..f47e7ea48 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -154,7 +154,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
 	 if (sigFd != -1)
 	    unlink(data);
 	 ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str());
-	 exit(EINTERNAL);
+	 exit(112);
       }
       Args.push_back(sig);
       Args.push_back(data);
diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index 08b10a97a..45f069058 100644
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -23,9 +23,18 @@
 /** \brief generates and run the command to verify a file with gpgv
  *
  * If File and FileSig specify the same file it is assumed that we
- * deal with a clear-signed message. In that case the file will be
- * rewritten to be in a good-known format without uneeded whitespaces
- * and additional messages (unsigned or signed).
+ * deal with a clear-signed message. Note that the method will accept
+ * and validate files which include additional (unsigned) messages
+ * without complaining. Do NOT open files accepted by this method
+ * for reading. Use #OpenMaybeClearSignedFile to access the message
+ * instead to ensure you are only reading signed data.
+ *
+ * The method does not return, but has some noteable exit-codes:
+ * 111 signals an internal error like the inability to execute gpgv,
+ * 112 indicates a clear-signed file which doesn't include a message,
+ *  which can happen if APT is run while on a network requiring
+ *  authentication before usage (e.g. in hotels)
+ * All other exit-codes are passed-through from gpgv.
  *
  * @param File is the message (unsigned or clear-signed)
  * @param FileSig is the signature (detached or clear-signed)
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
index 83b5a98d3..f84fb761c 100644
--- a/apt-pkg/contrib/sha2_internal.cc
+++ b/apt-pkg/contrib/sha2_internal.cc
@@ -632,7 +632,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 	usedspace = 0;
 }
 
@@ -653,7 +653,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
 	return buffer;
@@ -969,7 +969,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA512_End(SHA512_CTX* context, char buffer[]) {
@@ -989,7 +989,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
 	return buffer;
@@ -1044,7 +1044,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA384_End(SHA384_CTX* context, char buffer[]) {
@@ -1064,7 +1064,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
 	return buffer;
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 64731b482..8ce3a306f 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -759,7 +759,8 @@ bool ReadMessages(int Fd, vector<string> &List)
       for (char *I = Buffer; I + 1 < End; I++)
       {
 	 if (I[1] != '\n' ||
-	     (strncmp(I, "\n\n", 2) != 0 && strncmp(I, "\r\n\r\n", 4) != 0))
+
+	       (I[0] != '\n' && strncmp(I, "\r\n\r\n", 4) != 0))
 	    continue;
 	 
 	 // Pull the message out
@@ -767,7 +768,7 @@ bool ReadMessages(int Fd, vector<string> &List)
 	 PartialMessage += Message;
 
 	 // Fix up the buffer
-	 for (; I < End && (*I == '\r' || *I == '\n'); ++I);
+	 for (; I < End && (*I == '\n' || *I == '\r'); ++I);
 	 End -= I-Buffer;	 
 	 memmove(Buffer,I,End-Buffer);
 	 I = Buffer;
@@ -1484,9 +1485,12 @@ URI::operator string()
           
       if (User.empty() == false)
       {
-	 Res +=  User;
+	 // FIXME: Technically userinfo is permitted even less
+	 // characters than these, but this is not conveniently
+	 // expressed with a blacklist.
+	 Res += QuoteString(User, ":/?#[]@");
 	 if (Password.empty() == false)
-	    Res += ":" + Password;
+	    Res += ":" + QuoteString(Password, ":/?#[]@");
 	 Res += "@";
       }
       
@@ -1525,7 +1529,6 @@ string URI::SiteOnly(const string &URI)
    U.User.clear();
    U.Password.clear();
    U.Path.clear();
-   U.Port = 0;
    return U;
 }
 									/*}}}*/
@@ -1537,7 +1540,6 @@ string URI::NoUserPassword(const string &URI)
    ::URI U(URI);
    U.User.clear();
    U.Password.clear();
-   U.Port = 0;
    return U;
 }
 									/*}}}*/
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index db86bd698..28857176b 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -219,8 +219,12 @@ MD5SumValue debListParser::Description_md5()
    string const value = Section.FindS("Description-md5");
    if (value.empty() == true)
    {
+      std::string const desc = Description() + "\n";
+      if (desc == "\n")
+	 return MD5SumValue();
+
       MD5Summation md5;
-      md5.Add((Description() + "\n").c_str());
+      md5.Add(desc.c_str());
       return md5.Result();
    }
    else if (likely(value.size() == 32))
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 6a3e9bfc4..9f8422fec 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1004,7 +1004,7 @@ struct CompareProviders {
       }
       // higher priority seems like a good idea
       if (AV->Priority != BV->Priority)
-	 return AV->Priority < BV->Priority;
+	 return AV->Priority > BV->Priority;
       // prefer native architecture
       if (strcmp(A.Arch(), B.Arch()) != 0)
       {
@@ -1200,16 +1200,23 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	    verlist.insert(Cand);
 	 }
 	 CompareProviders comp(Start);
-	 APT::VersionList::iterator InstVer = std::max_element(verlist.begin(), verlist.end(), comp);
 
-	 if (InstVer != verlist.end())
-	 {
+	 do {
+	    APT::VersionList::iterator InstVer = std::max_element(verlist.begin(), verlist.end(), comp);
+
+	    if (InstVer == verlist.end())
+	       break;
+
 	    pkgCache::PkgIterator InstPkg = InstVer.ParentPkg();
 	    if(DebugAutoInstall == true)
 	       std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name()
 			 << " as " << Start.DepType() << " of " << Pkg.Name()
 			 << std::endl;
-	    MarkInstall(InstPkg, true, Depth + 1, false, ForceImportantDeps);
+	    if (MarkInstall(InstPkg, true, Depth + 1, false, ForceImportantDeps) == false)
+	    {
+	       verlist.erase(InstVer);
+	       continue;
+	    }
 	    // now check if we should consider it a automatic dependency or not
 	    if(InstPkg->CurrentVer == 0 && Pkg->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section()))
 	    {
@@ -1218,7 +1225,8 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
                             << Start.DepType() << " of pkg in APT::Never-MarkAuto-Sections)" << std::endl;
 	       MarkAuto(InstPkg, false);
 	    }
-	 }
+	    break;
+	 } while(true);
 	 continue;
       }
       /* Negative dependencies have no or-group
@@ -1243,9 +1251,16 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 		PkgState[Pkg->ID].CandidateVer != *I &&
 		MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true)
 	       continue;
-	    else if ((Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::DpkgBreaks) &&
-		     MarkDelete(Pkg,false,Depth + 1, false) == false)
-	       break;
+	    else if (Start->Type == pkgCache::Dep::Conflicts || 
+                     Start->Type == pkgCache::Dep::DpkgBreaks) 
+            {
+               if(DebugAutoInstall == true)
+                  std::clog << OutputInDepth(Depth) 
+                            << " Removing: " << Pkg.Name()
+                            << std::endl;
+               if (MarkDelete(Pkg,false,Depth + 1, false) == false)
+                  break;
+            }
 	 }
 	 continue;
       }
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index a262ef789..1d61b974d 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -544,11 +544,9 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName,		/*{{{*/
       FileFd Rel;
       Target.Open(TargetF,FileFd::WriteAtomic);
       Rel.Open(prefix + file,FileFd::ReadOnly);
-      if (_error->PendingError() == true)
-	 return false;
       if (CopyFile(Rel,Target) == false)
-	 return false;
-   
+	 return _error->Error("Copying of '%s' for '%s' from '%s' failed", file.c_str(), CDName.c_str(), prefix.c_str());
+
       return true;
 }
 									/*}}}*/
@@ -642,6 +640,18 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
    return true;
 }
 									/*}}}*/
+// SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV		/*{{{*/
+bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+      int const &statusfd, int fd[2]) {
+   ExecGPGV(File, FileOut, statusfd, fd);
+   return false;
+};
+bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+      int const &statusfd) {
+   ExecGPGV(File, FileOut, statusfd);
+   return false;
+};
+									/*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
 				vector<string> &List, pkgCdromStatus *log)
 {
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index aa221158e..e6a07a887 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -100,15 +100,9 @@ class SigVerify								/*{{{*/
 		      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
    __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
-		       int const &statusfd, int fd[2]) {
-      ExecGPGV(File, FileOut, statusfd, fd);
-      return false;
-   };
+		       int const &statusfd, int fd[2]);
    __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
-			      int const &statusfd = -1) {
-      ExecGPGV(File, FileOut, statusfd);
-      return false;
-   };
+			      int const &statusfd = -1);
 };
 									/*}}}*/
 
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 80d8fd490..984ae1d10 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -301,9 +301,8 @@ bool pkgOrderList::OrderConfigure()
 /* Higher scores order earlier */
 int pkgOrderList::Score(PkgIterator Pkg)
 {
-   static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 500);
-
-   // Removal is always done first
+   // Removals should be done after we dealt with essentials
+   static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 100);
    if (Cache[Pkg].Delete() == true)
       return ScoreDelete;
 
@@ -893,149 +892,136 @@ bool pkgOrderList::DepConfigure(DepIterator D)
 									/*}}}*/
 // OrderList::DepRemove - Removal ordering				/*{{{*/
 // ---------------------------------------------------------------------
-/* Removal visits all reverse depends. It considers if the dependency
-   of the Now state version to see if it is okay with removing this
-   package. This check should always fail, but is provided for symetery
-   with the other critical handlers.
- 
-   Loops are preprocessed and logged. Removal loops can also be
-   detected in the critical handler. They are characterized by an
-   old version of A depending on B but the new version of A conflicting
-   with B, thus either A or B must break to install. */
-bool pkgOrderList::DepRemove(DepIterator D)
+/* Checks all given dependencies if they are broken by the remove of a
+   package and if so fix it by visiting another provider or or-group
+   member to ensure that the dependee keeps working which is especially
+   important for Immediate packages like e.g. those depending on an
+   awk implementation. If the dependency can't be fixed with another
+   package this means an upgrade of the package will solve the problem. */
+bool pkgOrderList::DepRemove(DepIterator Broken)
 {
-   if (D.Reverse() == false)
+   if (Broken.Reverse() == false)
       return true;
-   for (; D.end() == false; ++D)
-      if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
+
+   for (; Broken.end() == false; ++Broken)
+   {
+      if (Broken->Type != pkgCache::Dep::Depends &&
+	    Broken->Type != pkgCache::Dep::PreDepends)
+	 continue;
+
+      PkgIterator BrokenPkg = Broken.ParentPkg();
+      // uninstalled packages can't break via a remove
+      if (BrokenPkg->CurrentVer == 0)
+	 continue;
+
+      // if its already added, we can't do anything useful
+      if (IsFlag(BrokenPkg, AddPending) == true || IsFlag(BrokenPkg, Added) == true)
+	 continue;
+
+      // if the dependee is going to be removed, visit it now
+      if (Cache[BrokenPkg].Delete() == true)
+	 return VisitNode(BrokenPkg, "Remove-Dependee");
+
+      // The package stays around, so find out how this is possible
+      for (DepIterator D = BrokenPkg.CurrentVer().DependsList(); D.end() == false;)
       {
-	 // Duplication elimination, consider the current version only
-	 if (D.ParentPkg().CurrentVer() != D.ParentVer())
+	 // only important or-groups need fixing
+	 if (D->Type != pkgCache::Dep::Depends &&
+	       D->Type != pkgCache::Dep::PreDepends)
+	 {
+	    ++D;
 	    continue;
+	 }
 
-	 /* We wish to see if the dep on the parent package is okay
-	    in the removed (install) state of the target pkg. */
-	 bool tryFixDeps = false;
-	 if (CheckDep(D) == true)
+	 // Start is the beginning of the or-group, D is the first one after or
+	 DepIterator Start = D;
+	 bool foundBroken = false;
+	 for (bool LastOR = true; D.end() == false && LastOR == true; ++D)
 	 {
-	    // We want to catch loops with the code below.
-	    if (IsFlag(D.ParentPkg(),AddPending) == false)
-	       continue;
+	    LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
+	    if (D == Broken)
+	       foundBroken = true;
 	 }
-	 else
-	    tryFixDeps = true;
 
-	 // This is the loop detection
-	 if (IsFlag(D.ParentPkg(),Added) == true || 
-	     IsFlag(D.ParentPkg(),AddPending) == true)
-	 {
-	    if (IsFlag(D.ParentPkg(),AddPending) == true)
-	       AddLoop(D);
+	 // this or-group isn't the broken one: keep searching
+	 if (foundBroken == false)
 	    continue;
+
+	 // iterate over all members of the or-group searching for a ready replacement
+	 bool readyReplacement = false;
+	 for (DepIterator OrMember = Start; OrMember != D && readyReplacement == false; ++OrMember)
+	 {
+	    Version ** Replacements = OrMember.AllTargets();
+	    for (Version **R = Replacements; *R != 0; ++R)
+	    {
+	       VerIterator Ver(Cache,*R);
+	       // only currently installed packages can be a replacement
+	       PkgIterator RPkg = Ver.ParentPkg();
+	       if (RPkg.CurrentVer() != Ver)
+		  continue;
+
+	       // packages going to be removed can't be a replacement
+	       if (Cache[RPkg].Delete() == true)
+		  continue;
+
+	       readyReplacement = true;
+	       break;
+	    }
+	    delete[] Replacements;
 	 }
 
-	 if (tryFixDeps == true)
+	 // something else is ready to take over, do nothing
+	 if (readyReplacement == true)
+	    continue;
+
+	 // see if we can visit a replacement
+	 bool visitReplacement = false;
+	 for (DepIterator OrMember = Start; OrMember != D && visitReplacement == false; ++OrMember)
 	 {
-	    for (pkgCache::DepIterator F = D.ParentPkg().CurrentVer().DependsList();
-		 F.end() == false; ++F)
+	    Version ** Replacements = OrMember.AllTargets();
+	    for (Version **R = Replacements; *R != 0; ++R)
 	    {
-	       if (F->Type != pkgCache::Dep::Depends && F->Type != pkgCache::Dep::PreDepends)
+	       VerIterator Ver(Cache,*R);
+	       // consider only versions we plan to install
+	       PkgIterator RPkg = Ver.ParentPkg();
+	       if (Cache[RPkg].Install() == false || Cache[RPkg].InstallVer != Ver)
 		  continue;
-	       // Check the Providers
-	       if (F.TargetPkg()->ProvidesList != 0)
-	       {
-		  pkgCache::PrvIterator Prov = F.TargetPkg().ProvidesList();
-		  for (; Prov.end() == false; ++Prov)
-		  {
-		     pkgCache::PkgIterator const P = Prov.OwnerPkg();
-		     if (IsFlag(P, InList) == true &&
-			 IsFlag(P, AddPending) == true &&
-			 IsFlag(P, Added) == false &&
-			 Cache[P].InstallVer == 0)
-			break;
-		  }
-		  if (Prov.end() == false)
-		     for (pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList();
-			  Prv.end() == false; ++Prv)
-		     {
-			pkgCache::PkgIterator const P = Prv.OwnerPkg();
-			if (IsFlag(P, InList) == true &&
-			    IsFlag(P, AddPending) == false &&
-			    Cache[P].InstallVer != 0 &&
-			    VisitNode(P, "Remove-P") == true)
-			{
-			   Flag(P, Immediate);
-			   tryFixDeps = false;
-			   break;
-			}
-		     }
-		  if (tryFixDeps == false)
-		     break;
-	       }
 
-	       // Check for Or groups
-	       if ((F->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or)
+	       // loops are not going to help us, so don't create them
+	       if (IsFlag(RPkg, AddPending) == true)
 		  continue;
-	       // Lets see if the package is part of the Or group
-	       pkgCache::DepIterator S = F;
-	       for (; S.end() == false; ++S)
+
+	       if (IsMissing(RPkg) == true)
+		  continue;
+
+	       visitReplacement = true;
+	       if (IsFlag(BrokenPkg, Immediate) == false)
 	       {
-		  if (S.TargetPkg() == D.TargetPkg())
+		  if (VisitNode(RPkg, "Remove-Rep") == true)
 		     break;
-		  if ((S->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or ||
-		      CheckDep(S)) // Or group is satisfied by another package
-		     for (;S.end() == false; ++S);
 	       }
-	       if (S.end() == true)
-		  continue;
-	       // skip to the end of the or group
-	       for (;S.end() == false && (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; ++S);
-	       ++S;
-	       // The soon to be removed is part of the Or group
-	       // start again in the or group and find something which will serve as replacement
-	       for (; F.end() == false && F != S; ++F)
+	       else
 	       {
-		  if (IsFlag(F.TargetPkg(), InList) == true &&
-		      IsFlag(F.TargetPkg(), AddPending) == false &&
-		      Cache[F.TargetPkg()].InstallVer != 0 &&
-		      VisitNode(F.TargetPkg(), "Remove-Target") == true)
-		  {
-		     Flag(F.TargetPkg(), Immediate);
-		     tryFixDeps = false;
+		  Flag(RPkg, Immediate);
+		  if (VisitNode(RPkg, "Remove-ImmRep") == true)
 		     break;
-		  }
-		  else if (F.TargetPkg()->ProvidesList != 0)
-		  {
-		     pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList();
-		     for (; Prv.end() == false; ++Prv)
-		     {
-			if (IsFlag(Prv.OwnerPkg(), InList) == true &&
-			    IsFlag(Prv.OwnerPkg(), AddPending) == false &&
-			    Cache[Prv.OwnerPkg()].InstallVer != 0 &&
-			    VisitNode(Prv.OwnerPkg(), "Remove-Owner") == true)
-			{
-			   Flag(Prv.OwnerPkg(), Immediate);
-			   tryFixDeps = false;
-			   break;
-			}
-		     }
-		     if (Prv.end() == false)
-			break;
-		  }
 	       }
-	       if (tryFixDeps == false)
-		  break;
+	       visitReplacement = false;
 	    }
+	    delete[] Replacements;
 	 }
-
-	 // Skip over missing files
-	 if (IsMissing(D.ParentPkg()) == true)
+	 if (visitReplacement == true)
 	    continue;
-	 
-	 if (VisitNode(D.ParentPkg(), "Remove-Parent") == false)
+
+	 // the broken package in current version can't be fixed, so install new version
+	 if (IsMissing(BrokenPkg) == true)
+	    break;
+
+	 if (VisitNode(BrokenPkg, "Remove-Upgrade") == false)
 	    return false;
       }
-   
+   }
+
    return true;
 }
 									/*}}}*/
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 9848ac1b0..8c0d2e855 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -340,6 +340,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
    bool Bad = false, Changed = false;
    const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
    unsigned int i=0;
+   std::list<DepIterator> needConfigure;
    do
    {
       Changed = false;
@@ -353,7 +354,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 	    continue;
 	 Bad = true;
 
-	 // Search for dependencies which are unpacked but aren't configured yet (maybe loops)
+	 // Check for dependencies that have not been unpacked, probably due to loops.
 	 for (DepIterator Cur = Start; true; ++Cur)
 	 {
 	    SPtrArray<Version *> VList = Cur.AllTargets();
@@ -373,51 +374,66 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 	       }
 
 	       // Check if the version that is going to be installed will satisfy the dependency
-	       if (Cache[DepPkg].InstallVer != *I)
+	       if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false)
 		  continue;
 
-	       if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+	       if (PkgLoop == true)
 	       {
-		  if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop)
-		  {
-		    // This dependency has already been dealt with by another SmartConfigure on Pkg
-		    Bad = false;
-		    break;
-		  }
-		  /* Check for a loop to prevent one forming
-		       If A depends on B and B depends on A, SmartConfigure will
-		       just hop between them if this is not checked. Dont remove the
-		       loop flag after finishing however as loop is already set.
-		       This means that there is another SmartConfigure call for this
-		       package and it will remove the loop flag */
+		  if (Debug)
+		     std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
+	          Bad = false;
+		  break;
+	       }
+	       else
+	       {
+		  if (Debug)
+		     clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl;
 		  if (PkgLoop == false)
 		     List->Flag(Pkg,pkgOrderList::Loop);
-		  if (SmartConfigure(DepPkg, Depth + 1) == true)
+		  if (SmartUnPack(DepPkg, true, Depth + 1) == true)
 		  {
 		     Bad = false;
 		     if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
-			Changed = true;
+		        Changed = true;
 		  }
 		  if (PkgLoop == false)
-		    List->RmFlag(Pkg,pkgOrderList::Loop);
-		  // If SmartConfigure was succesfull, Bad is false, so break
+		     List->RmFlag(Pkg,pkgOrderList::Loop);
 		  if (Bad == false)
 		     break;
 	       }
-	       else if (List->IsFlag(DepPkg,pkgOrderList::Configured))
-	       {
-		  Bad = false;
-		  break;
-	       }
 	    }
-	    if (Cur == End)
+
+	    if (Cur == End || Bad == false)
 	       break;
-         }
+	 }
 
 	 if (Bad == false)
 	    continue;
 
-	 // Check for dependencies that have not been unpacked, probably due to loops.
+	 needConfigure.push_back(Start);
+      }
+      if (i++ > max_loops)
+         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (1) for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);
+
+   Bad = false, Changed = false, i = 0;
+   do
+   {
+      Changed = false;
+      for (std::list<DepIterator>::const_iterator D = needConfigure.begin(); D != needConfigure.end(); ++D)
+      {
+	 // Compute a single dependency element (glob or) without modifying D
+	 pkgCache::DepIterator Start, End;
+	 {
+	    pkgCache::DepIterator Discard = *D;
+	    Discard.GlobOr(Start,End);
+	 }
+
+	 if (End->Type != pkgCache::Dep::Depends)
+	    continue;
+	 Bad = true;
+
+	 // Search for dependencies which are unpacked but aren't configured yet (maybe loops)
 	 for (DepIterator Cur = Start; true; ++Cur)
 	 {
 	    SPtrArray<Version *> VList = Cur.AllTargets();
@@ -428,44 +444,53 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 	       PkgIterator DepPkg = Ver.ParentPkg();
 
 	       // Check if the version that is going to be installed will satisfy the dependency
-	       if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false)
+	       if (Cache[DepPkg].InstallVer != *I)
 		  continue;
 
-	       if (PkgLoop == true)
-	       {
-		  if (Debug)
-		     std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
-	          Bad = false;
-		  break;
-	       }
-	       else
+	       if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
 	       {
-		  if (Debug)
-		     clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl;
+		  if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop)
+		  {
+		    // This dependency has already been dealt with by another SmartConfigure on Pkg
+		    Bad = false;
+		    break;
+		  }
+		  /* Check for a loop to prevent one forming
+		       If A depends on B and B depends on A, SmartConfigure will
+		       just hop between them if this is not checked. Dont remove the
+		       loop flag after finishing however as loop is already set.
+		       This means that there is another SmartConfigure call for this
+		       package and it will remove the loop flag */
 		  if (PkgLoop == false)
 		     List->Flag(Pkg,pkgOrderList::Loop);
-		  if (SmartUnPack(DepPkg, true, Depth + 1) == true)
+		  if (SmartConfigure(DepPkg, Depth + 1) == true)
 		  {
 		     Bad = false;
 		     if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
-		        Changed = true;
+			Changed = true;
 		  }
 		  if (PkgLoop == false)
-		     List->RmFlag(Pkg,pkgOrderList::Loop);
+		    List->RmFlag(Pkg,pkgOrderList::Loop);
+		  // If SmartConfigure was succesfull, Bad is false, so break
 		  if (Bad == false)
 		     break;
 	       }
+	       else if (List->IsFlag(DepPkg,pkgOrderList::Configured))
+	       {
+		  Bad = false;
+		  break;
+	       }
 	    }
-
-	    if (Cur == End)
+	    if (Cur == End || Bad == false)
 	       break;
-	 }
+         }
+
 
 	 if (Bad == true && Changed == false && Debug == true)
-	    std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl;
+	    std::clog << OutputInDepth(Depth) << "Could not satisfy " << *D << std::endl;
       }
       if (i++ > max_loops)
-         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack for %s, aborting", Pkg.FullName().c_str());
+         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (2) for %s, aborting", Pkg.FullName().c_str());
    } while (Changed == true);
    
    if (Bad) {
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 3f10b6c40..7ce7aba7b 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -296,6 +296,8 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator
 
    // Find the right version to write the description
    MD5SumValue CurMd5 = List.Description_md5();
+   if (CurMd5.Value().empty() == true || List.Description().empty() == true)
+      return true;
    std::string CurLang = List.DescriptionLanguage();
 
    for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
@@ -480,7 +482,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 
    /* Record the Description (it is not translated) */
    MD5SumValue CurMd5 = List.Description_md5();
-   if (CurMd5.Value().empty() == true)
+   if (CurMd5.Value().empty() == true || List.Description().empty() == true)
       return true;
    std::string CurLang = List.DescriptionLanguage();
 
diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index 6928d626c..a9d48dd97 100644
--- a/buildlib/apti18n.h.in
+++ b/buildlib/apti18n.h.in
@@ -25,4 +25,5 @@
 # define _(x) x
 # define P_(msg,plural,n) (n == 1 ? msg : plural)
 # define N_(x) x
+# define dgettext(d, m) m
 #endif
diff --git a/buildlib/copy.mak b/buildlib/copy.mak
index e8fe43deb..3ae11a7eb 100644
--- a/buildlib/copy.mak
+++ b/buildlib/copy.mak
@@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL)
 
 MKDIRS += $(dir $($(LOCAL)-LIST))
 
-$($(LOCAL)-LIST) : $(TO)/% : % dirs
+$($(LOCAL)-LIST) : $(TO)/% : %
 	echo Installing $< to $(@D)
 	cp $< $(@D)
 
diff --git a/buildlib/library.mak b/buildlib/library.mak
index 029e87463..ef1306b66 100644
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -51,7 +51,7 @@ $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
 	ln -sf $(<F) $@
 
 # The binary build rule
-$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
+$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) $(LIBRARYDEPENDS)
 	-rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null
 	echo Building shared library $@
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
@@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
-$(OBJ)/%.opic: %.cc
+$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
 	echo Compiling $< to $@
 	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 	$(DoDep)
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 09eca0ec2..1e778cf11 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -25,6 +25,7 @@ $(LOCAL)-LIST := $(SOURCE)
 
 # Install generation hooks
 manpages: $($(LOCAL)-LIST)
+clean: clean/$(LOCAL)
 veryclean: veryclean/$(LOCAL)
 
 apt-verbatim.ent: ../apt-verbatim.ent
@@ -37,15 +38,16 @@ manpage-style.xsl: ../manpage-style.xsl
 $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
 	echo Creating man page $@
 	$(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
-	test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed
+	test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed'
 	mv -f $(subst .$(LC),,$@) $@
 
 # Clean rule
-.PHONY: veryclean/$(LOCAL)
+.PHONY: clean/$(LOCAL) veryclean/$(LOCAL)
+clean/$(LOCAL):
+	rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent
 veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \
-		$(addsuffix .xml,$($(@F)-LIST)) \
-		offline.$(LC).sgml guide.$(LC).sgml
+	# we are nuking the directory we are working in as it is auto-generated
+	rm -rf $(shell readlink -f .)
 
 HAVE_PO4A=yes
 endif
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index cca7d55be..265359abc 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -4,6 +4,8 @@
 # declared domain of the make file. It also arranges to set the DOMAIN 
 # CPPFLAG for the compilation.
 
+ifneq ($(APT_DOMAIN),none)
+
 MY_DOMAIN := $(PACKAGE)
 ifdef APT_DOMAIN
 $($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DAPT_DOMAIN='"$(APT_DOMAIN)"'
@@ -13,10 +15,13 @@ endif
 MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs
-	(echo $(SRC) | xargs -n1 echo) > $@
+	(echo $(SRC) | xargs -n1 echo) > $@.tmp
+	cmp --silent $@.tmp $@ || mv $@.tmp $@
 startup binary program clean update-po: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
 veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 veryclean/po/$(LOCAL):
 	rm -f $(LIST)
+
+endif
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 0a2c28d23..fb4467c2c 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1161,7 +1161,11 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
    }
 
    // Get a pointer to start of Description field
-   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
+   const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "\nDescription");
+   if (DescP != NULL)
+      ++DescP;
+   else
+      DescP = Buffer + V.FileList()->Size;
 
    // Write all but Description
    if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
@@ -1173,25 +1177,38 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
    // Show the right description
    pkgRecords Recs(*Cache);
    pkgCache::DescIterator Desc = V.TranslatedDescription();
-   pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
-   cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
-
-   // Find the first field after the description (if there is any)
-   for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++) 
+   if (Desc.end() == false)
    {
-      if(*DescP == '\n' && *(DescP+1) != ' ') 
+      pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
+      cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
+      cout << std::endl << "Description-md5: " << Desc.md5() << std::endl;
+
+      // Find the first field after the description (if there is any)
+      while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL)
       {
-	 // write the rest of the buffer
-	 const unsigned char *end=&Buffer[V.FileList()->Size];
-	 if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP)) 
-	 {
-	    delete [] Buffer;
-	    return false;
-	 }
+	 if (DescP[1] == ' ')
+	    DescP += 2;
+	 else if (strncmp((char*)DescP, "\nDescription", strlen("\nDescription")) == 0)
+	    DescP += strlen("\nDescription");
+	 else
+	    break;
+      }
+      if (DescP != NULL)
+	 ++DescP;
+   }
+   // if we have no translation, we found a lonely Description-md5, so don't skip it
 
-	 break;
+   if (DescP != NULL)
+   {
+      // write the rest of the buffer
+      const unsigned char *end=&Buffer[V.FileList()->Size];
+      if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP))
+      {
+	 delete [] Buffer;
+	 return false;
       }
    }
+
    // write a final newline (after the description)
    cout<<endl;
    delete [] Buffer;
@@ -1203,7 +1220,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
 struct ExDescFile
 {
    pkgCache::DescFile *Df;
-   bool NameMatch;
+   map_ptrloc ID;
 };
 
 // Search - Perform a search						/*{{{*/
@@ -1246,37 +1263,48 @@ bool Search(CommandLine &CmdL)
       return false;
    }
    
-   ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1];
-   memset(DFList,0,sizeof(*DFList)*Cache->HeaderP->GroupCount+1);
+   size_t const descCount = Cache->HeaderP->GroupCount + 1;
+   ExDescFile *DFList = new ExDescFile[descCount];
+   memset(DFList,0,sizeof(*DFList) * descCount);
+
+   bool PatternMatch[descCount * NumPatterns];
+   memset(PatternMatch,false,sizeof(PatternMatch));
 
    // Map versions that we want to write out onto the VerList array.
    for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
    {
-      if (DFList[G->ID].NameMatch == true)
-	 continue;
-
-      DFList[G->ID].NameMatch = true;
-      for (unsigned I = 0; I != NumPatterns; I++)
+      size_t const PatternOffset = G->ID * NumPatterns;
+      size_t unmatched = 0, matched = 0;
+      for (unsigned I = 0; I < NumPatterns; ++I)
       {
-	 if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
-	    continue;
-	 DFList[G->ID].NameMatch = false;
-	 break;
+	 if (PatternMatch[PatternOffset + I] == true)
+	    ++matched;
+	 else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
+	    PatternMatch[PatternOffset + I] = true;
+	 else
+	    ++unmatched;
       }
-        
-      // Doing names only, drop any that dont match..
-      if (NamesOnly == true && DFList[G->ID].NameMatch == false)
+
+      // already dealt with this package?
+      if (matched == NumPatterns)
 	 continue;
-	 
+
+      // Doing names only, drop any that don't match..
+      if (NamesOnly == true && unmatched == NumPatterns)
+	 continue;
+
       // Find the proper version to use
       pkgCache::PkgIterator P = G.FindPreferredPkg();
       if (P.end() == true)
 	 continue;
       pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
       if (V.end() == false)
+      {
 	 DFList[G->ID].Df = V.TranslatedDescription().FileList();
+	 DFList[G->ID].ID = G->ID;
+      }
 
-      if (DFList[G->ID].NameMatch == false)
+      if (unmatched == NumPatterns)
 	 continue;
 
       // Include all the packages that provide matching names too
@@ -1288,33 +1316,45 @@ bool Search(CommandLine &CmdL)
 
 	 unsigned long id = Prv.OwnerPkg().Group()->ID;
 	 DFList[id].Df = V.TranslatedDescription().FileList();
-	 DFList[id].NameMatch = true;
+	 DFList[id].ID = id;
+
+	 size_t const PrvPatternOffset = id * NumPatterns;
+	 for (unsigned I = 0; I < NumPatterns; ++I)
+	    PatternMatch[PrvPatternOffset + I] = PatternMatch[PatternOffset + I];
       }
    }
-   
+
    LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList));
 
    // Create the text record parser
    pkgRecords Recs(*Cache);
    // Iterate over all the version records and check them
-   for (ExDescFile *J = DFList; J->Df != 0; J++)
+   for (ExDescFile *J = DFList; J->Df != 0; ++J)
    {
       pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));
+      size_t const PatternOffset = J->ID * NumPatterns;
 
-      if (J->NameMatch == false && NamesOnly == false)
+      if (NamesOnly == false)
       {
 	 string const LongDesc = P.LongDesc();
-	 J->NameMatch = true;
-	 for (unsigned I = 0; I != NumPatterns; I++)
+	 for (unsigned I = 0; I < NumPatterns; ++I)
 	 {
-	    if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
+	    if (PatternMatch[PatternOffset + I] == true)
 	       continue;
-	    J->NameMatch = false;
-	    break;
+	    else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
+	       PatternMatch[PatternOffset + I] = true;
 	 }
       }
-      
-      if (J->NameMatch == true)
+
+      bool matchedAll = true;
+      for (unsigned I = 0; I < NumPatterns; ++I)
+	 if (PatternMatch[PatternOffset + I] == false)
+	 {
+	    matchedAll = false;
+	    break;
+	 }
+
+      if (matchedAll == true)
       {
 	 if (ShowFull == true)
 	 {
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 2551f4916..c153cca85 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -39,6 +39,12 @@
 
 #include <apti18n.h>
 									/*}}}*/
+static const char *W_NO_CDROM_FOUND = \
+   N_("No CD-ROM could be auto-detected or found using "
+      "the default mount point.\n"
+      "You may try the --cdrom option to set the CD-ROM mount point. "
+      "See 'man apt-cdrom' for more "
+      "information about the CD-ROM auto-detection and mount point.");
 
 using namespace std;
 
@@ -135,7 +141,6 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
    return true;
 }
 									/*}}}*/
-
 // DoAdd - Add a new CDROM						/*{{{*/
 // ---------------------------------------------------------------------
 /* This does the main add bit.. We show some status and things. The
@@ -150,13 +155,15 @@ bool DoAdd(CommandLine &)
    bool res = true;
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
+   unsigned int count = 0;
    if (AutoDetect && UdevCdroms.Dlopen())
-   {
-      unsigned int count = 0;
       while (AutoDetectCdrom(UdevCdroms, count))
 	 res &= cdrom.Add(&log);
-   } else {
+   if (count == 0) {
       res = cdrom.Add(&log);
+      if (res == false) {
+         _error->Error("%s", _(W_NO_CDROM_FOUND));
+      }
    }
 
    if(res)
@@ -178,15 +185,16 @@ bool DoIdent(CommandLine &)
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
 
+   unsigned int count = 0;
    if (AutoDetect && UdevCdroms.Dlopen())
-   {
-      unsigned int count = 0;
       while (AutoDetectCdrom(UdevCdroms, count))
 	 res &= cdrom.Ident(ident, &log);
-   } else {
-      return cdrom.Ident(ident, &log);
+   if (count == 0) {
+      res = cdrom.Ident(ident, &log);
+      if (res == false) {
+         _error->Error("%s", _(W_NO_CDROM_FOUND));
+      }
    }
- 
    return res;
 }
 									/*}}}*/
@@ -218,7 +226,7 @@ int ShowHelp()
       "  -m   No mounting\n"
       "  -f   Fast mode, don't check package files\n"
       "  -a   Thorough scan mode\n"
-      "  --auto-detect Auto detect drive and mount point\n"
+      "  --no-auto-detect Do not try to auto detect drive and mount point\n"
       "  -c=? Read this configuration file\n"
       "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
       "See fstab(5)\n";
@@ -229,7 +237,7 @@ int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
-      {  0,"auto-detect","Acquire::cdrom::AutoDetect",0},
+      {  0,"auto-detect","Acquire::cdrom::AutoDetect", CommandLine::Boolean},
       {'v',"version","version",0},
       {'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg},
       {'r',"rename","APT::CDROM::Rename",0},
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index df24609b6..2bd4cad53 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1962,7 +1962,6 @@ bool DoInstall(CommandLine &CmdL)
       if (Fix != NULL)
       {
 	 // Call the scored problem resolver
-	 Fix->InstallProtect();
 	 Fix->Resolve(true);
 	 delete Fix;
       }
@@ -3123,8 +3122,7 @@ bool DoBuildDep(CommandLine &CmdL)
             }
 	 }	       
       }
-      
-      Fix.InstallProtect();
+
       if (Fix.Resolve(true) == false)
 	 _error->Discard();
       
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 166508c8e..65d3f5400 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -32,6 +32,16 @@ requires_root() {
 	fi
 }
 
+# gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead.
+init_keyring() {
+    for path; do
+        if ! [ -e "$path" ]; then
+            touch -- "$path"
+            chmod 0644 -- "$path"
+        fi
+    done
+}
+
 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1
     MASTER=$2
@@ -173,7 +183,7 @@ if [ "$1" = "--keyring" ]; then
         #echo "keyfile given"
 	shift
 	TRUSTEDFILE="$1"
-	if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then
+	if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then
 		GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
 	else
 		echo >&2 "Error: The specified keyring ยป$TRUSTEDFILEยซ is missing or not readable"
@@ -218,33 +228,42 @@ fi
 case "$command" in
     add)
         requires_root
+        init_keyring "$TRUSTEDFILE"
         $GPG --quiet --batch --import "$1"
         echo "OK"
         ;;
     del|rm|remove)
         requires_root
+        init_keyring "$TRUSTEDFILE"
         $GPG --quiet --batch --delete-key --yes "$1"
         echo "OK"
         ;;
     update)
+        init_keyring "$TRUSTEDFILE"
 	update
 	;;
     net-update)
+        init_keyring "$TRUSTEDFILE"
 	net_update
 	;;
     list)
+        init_keyring "$TRUSTEDFILE"
         $GPG --batch --list-keys
         ;;
     finger*)
+        init_keyring "$TRUSTEDFILE"
         $GPG --batch --fingerprint
         ;;
     export)
+        init_keyring "$TRUSTEDFILE"
         $GPG --armor --export "$1"
         ;;
     exportall)
+        init_keyring "$TRUSTEDFILE"
         $GPG --armor --export
         ;;
     adv*)
+        init_keyring "$TRUSTEDFILE"
         echo "Executing: $GPG $*"
         $GPG $*
         ;;
diff --git a/cmdline/makefile b/cmdline/makefile
index f3712232a..460a71240 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -14,7 +14,7 @@ include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
-SLIBS = -lapt-pkg -lutil $(INTLLIBS)
+SLIBS = -lapt-pkg $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)
diff --git a/configure.in b/configure.in
index 44334e3e9..b0ec78c81 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.9~exp3ubuntu1"
+PACKAGE_VERSION="0.9.9ubuntu1"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index 1194658c2..ae8141966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,156 @@
-apt (0.9.7.9~exp3ubuntu1) UNRELEASEDsaucy; urgency=low
+apt (0.9.9ubuntu1) UNRELEASEDsaucy; urgency=low
 
-  * merged from debian
+  * merged from the debian/sid branch
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Apr 2013 10:28:43 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Jul 2013 16:48:08 +0200
 
-apt (0.9.7.9~exp3) experimental; urgency=low
+apt (0.9.9) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * improve debug output for the Debug::pkgProblemResolver and
+    Debug::pkgDepCache::AutoInstall
+  * improve apt-cdrom output when no CD-ROM can be auto-detected
+  * document --no-auto-detect in apt-cdrom
+
+  [ David Kalnischkies ]
+  * build the en manpages in subdirectory doc/en
+  * remove -ldl from cdrom and -lutil from apt-get linkage
+  * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting
+    (Closes: 645713)
+  * prefer Essentials over Removals in ordering score
+  * fix priority sorting by prefering higher in MarkInstall
+  * try all providers in order if uninstallable in MarkInstall
+  * do unpacks before configures in SmartConfigure (Closes: #707578)
+  * fix support for multiple patterns in apt-cache search (Closes: #691453)
+  * set Fail flag in FileFd on all errors consistently
+  * don't explicitly init ExtractTar InFd with invalid fd
+  * OpenDescriptor should autoclose fd always on error (Closes: #704608)
+  * fail in CopyFile if the FileFds have error flag set
+  * ensure state-dir exists before coyping cdrom files
+  * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921)
+  * handle missing "Description" in apt-cache show (Closes: #712435)
+  * try defaults if auto-detection failed in apt-cdrom (Closes: #712433)
+  * support \n and \r\n line endings in ReadMessages
+  * do not redownload unchanged InRelease files
+  * trigger NODATA error for invalid InRelease files (Closes: #712486)
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 02 Jul 2013 08:58:33 +0200
+
+apt (0.9.8.2) unstable; urgency=low
+
+  [ Programs translations ]
+  * French translation : typo fix. Closes: #677272
+
+  [ Guillem Jover ]
+  * Update Vcs fields (Closes: #708562)
+  
+  [ Michael Vogt ]
+  * buildlib/apti18n.h.in:
+    - fix build failure when building without NLS (closes: #671587)
+  
+  [ Gregoire Menuel ]
+  * Fix double free (closes: #711045)
+  
+  [ Raphael Geissert ]
+  * Fix crash when the "mirror" method does not find any entry
+    (closes: #699303)
+
+  [ Johan Kiviniemi ]
+  * cmdline/apt-key:
+    - Create new keyrings with mode 0644 instead of 0600.
+    - Accept a nonexistent --keyring file with the adv subcommand as well.
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 06 Jun 2013 19:15:14 +0200
+
+apt (0.9.8.1) unstable; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/indexcopy.cc:
+    - non-inline RunGPGV methods to restore ABI compatibility with previous
+      versions to fix partial upgrades (Closes: #707771)
+  
+  [ Michael Vogt ]
+  * moved source to http://git.debian.org/apt/apt.git
+  * updated gbp.conf to match what bzr-buildpackage is doing
+  * remove .bzr-buildpackage/default.conf (superseeded by gbp.conf)
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 16 May 2013 14:50:43 +0200
+
+apt (0.9.8) unstable; urgency=low
+
+  [ Ludovico Cavedon ]
+  * properly handle if-modfied-since with libcurl/https 
+    (closes: #705648)
+  
+  [ Andreas Beckman ]
+  * apt-pkg/algorithms.cc:
+    - Do not propagate negative scores from rdepends. Propagating the absolute
+      value of a negative score may boost obsolete packages and keep them
+      installed instead of installing their successors.  (Closes: #699759)
 
   [ Michael Vogt ]
   * apt-pkg/sourcelist.cc:
+    - fix segfault when a hostname contains a [, thanks to
+      Tzafrir Cohen (closes: #704653)
+  * debian/control:
+    - replace manpages-it (closes: #704723)
+
+  [ David Kalnischkies ]
+  * various simple changes to fix cppcheck warnings
+  * apt-pkg/pkgcachegen.cc:
+    - do not store the MD5Sum for every description language variant as
+      it will be the same for all so it can be shared to save cache space
+    - handle language tags for descriptions are unique strings to be shared
+    - factor version string creation out of NewDepends, so we can easily reuse
+      version strings e.g. for implicit multi-arch dependencies
+    - equal comparisions are used mostly in same-source relations,
+      so use this to try to reuse some version strings
+    - sort group and package names in the hashtable on insert
+    - share version strings between same versions (of different architectures)
+      to save some space and allow quick comparisions later on
+  * apt-pkg/pkgcache.cc:
+    - assume sorted hashtable entries for groups/packages
+  * apt-pkg/cacheiterators.h:
+    - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck
+  * apt-pkg/deb/debversion.cc:
+    - add a string-equal shortcut for equal version comparisions
+
+  [ Marc Deslauriers ]
+  * make apt-ftparchive generate missing deb-src hashes (LP: #1078697)
+
+  [ Yaroslav Halchenko ]
+  * Fix English spelling error in a message ('A error'). Unfuzzy
+    translations. Closes: #705087
+
+  [ Programs translations ]
+  * French translation completed (Christian Perrier)
+
+  [ Manpages translations ]
+  * French translation completed (Christian Perrier)
+
+  [ Daniel Hartwig ]
+  * apt-pkg/contrib/strutl.cc:
+    - include port in shortened URIs (e.g. with apt-cache policy, progress
+      display) thanks to James McCoy (Closes: #154868, #322074)
+    - percent-encode username and password when writing URIs
+  * methods/http.cc:
+    - properly escape IP-literals (e.g. IPv6 address) when building
+      Host headers and URIs (Closes: #620344)
+  * methods/https.cc:
+    - use https_proxy environment variable if present, falling back to
+      http_proxy otherwise
+    - use authentication credentials from proxy URI
+      (Closes: #651640, LP: #1087512)
+    - environment variables do not override an explicit no proxy
+      directive ("DIRECT") in apt.conf
+    - disregard all_proxy environment variable, like other methods
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 08 May 2013 18:43:28 +0200
+
+apt (0.9.7.9~exp3) experimental; urgency=low
+  
+  [ Michael Vogt ]
+  * apt-pkg/sourcelist.cc:
     - fix segfault when a hostname contains a [, thanks to 
       Tzafrir Cohen (closes: #704653)
   * debian/control:
@@ -45,8 +188,25 @@ apt (0.9.7.9~exp3) experimental; urgency=low
   
   [ Manpages translations ]
   * French translation completed (Christian Perrier)
+
+  [ Daniel Hartwig ]
+  * apt-pkg/contrib/strutl.cc:
+    - include port in shortened URIs (e.g. with apt-cache policy, progress
+      display) thanks to James McCoy (Closes: #154868, #322074)
+    - percent-encode username and password when writing URIs
+  * methods/http.cc:
+    - properly escape IP-literals (e.g. IPv6 address) when building
+      Host headers and URIs (Closes: #620344)
+  * methods/https.cc:
+    - use https_proxy environment variable if present, falling back to
+      http_proxy otherwise
+    - use authentication credentials from proxy URI
+      (Closes: #651640, LP: #1087512)
+    - environment variables do not override an explicit no proxy
+      directive ("DIRECT") in apt.conf
+    - disregard all_proxy environment variable, like other methods
   
- -- Michael Vogt <mvo@debian.org>  Mon, 08 Apr 2013 17:09:00 +0200
+ -- Michael Vogt <mvo@debian.org>  Wed, 08 May 2013 18:43:28 +0200
 
 apt (0.9.7.9~exp2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 5cdacfc34..3d4fcc86d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.9.3
 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
- gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
+ gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
  zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
  po4a (>= 0.34-2), autotools-dev, autoconf, automake
 Build-Depends-Indep: doxygen, debiandoc-sgml
 Build-Conflicts: autoconf2.13, automake1.4
-Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
-Vcs-Browser: http://code.launchpad.net/apt/ubuntu
+XS-Original-Vcs-Git: git://anonscm.debian.org/apt/apt.git
+XS-Original-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
 
 Package: apt
 Architecture: any
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000000000..db22e3e1e
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+prebuild = ./prepare-release pre-export
+postbuild = ./prepare-release post-build
+export-dir = ../build-area
+debian-branch = debian/sid
+debian-tag = %(version)s
diff --git a/debian/rules b/debian/rules
index a2dbe513e..bdd8d09c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,7 +210,7 @@ apt: build build-manpages
 	dh_bugfiles -p$@
 	dh_lintian -p$@
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
-	dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
+	dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
 	dh_installcron -p$@
 	dh_installdocs -p$@
 	dh_installchangelogs -p$@
@@ -260,7 +260,7 @@ apt-utils: build build-manpages
 	dh_installexamples -p$@
 
 	# Install the man pages..
-	dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
+	dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
 
 	dh_installchangelogs -p$@
 	dh_strip -p$@
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 943511f03..b076a98a3 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -81,6 +81,14 @@
    &apt-cmdblurb;
    
    <variablelist>
+     <varlistentry><term><option>--no-auto-detect</option></term><term><option>--cdrom</option></term>
+     <listitem><para>Do not try to auto-detect the CD-ROM path. Usually combined with the <option>--cdrom</option> option.
+      Configuration Item: <literal>Acquire::cdrom::AutoDetect</literal>.
+     </para>
+     </listitem>
+     </varlistentry>
+     
+
      <varlistentry><term><option>-d</option></term><term><option>--cdrom</option></term>
      <listitem><para>Mount point; specify the location to mount the CD-ROM. This
       mount point must be listed in <filename>/etc/fstab</filename> and
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 631a7dcab..1ab7b6056 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.9~exp3ubuntu1">
+<!ENTITY apt-product-version "0.9.8">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "squeeze">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index be1d7ade8..3cf3136d3 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -98,8 +98,7 @@ APT {
 DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 </programlisting></informalexample>
 
-   <para>In general the sample configuration file in 
-   <filename>&docdir;examples/apt.conf</filename> &configureindex;
+   <para>In general the sample configuration file &configureindex;
    is a good guide for how it should look.</para>
 
    <para>Case is not significant in names of configuration items, so in the
diff --git a/doc/en/makefile b/doc/en/makefile
new file mode 100644
index 000000000..a4fb232d4
--- /dev/null
+++ b/doc/en/makefile
@@ -0,0 +1,38 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/en
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+ifdef XSLTPROC
+# generate a list of accepted man page translations
+SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml))
+INCLUDES = ../apt.ent ../apt-verbatim.ent
+STYLESHEET=../manpage-style.xsl
+
+LOCAL := manpage-$(firstword $(SOURCE))
+$(LOCAL)-LIST := $(SOURCE)
+
+# Install generation hooks
+manpages: $($(LOCAL)-LIST) apt.8
+
+$($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES)
+	echo Creating man page $@
+	$(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+apt.8: ../apt.8
+	cp -a ../apt.8 apt.8
+
+# Clean rule
+.PHONY: clean/$(LOCAL)
+veryclean: clean/$(LOCAL)
+clean: clean/$(LOCAL)
+clean/$(LOCAL):
+	-rm -rf $($(@F)-LIST) apt.8
+endif
+
+# Chain to the manpage rule
+SOURCE = apt.8
+include $(MANPAGE_H)
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f75b5738a..f4d9d17f2 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -225,7 +225,7 @@ Acquire
 	Verify-Peer "false";
 	SslCert "/etc/apt/some.pem";
 	CaPath  "/etc/ssl/certs";
-	Verify-Host" "true";
+	Verify-Host "true";
 	AllowRedirect  "true";
 
 	Timeout "120";
diff --git a/doc/makefile b/doc/makefile
index 2516cd128..266caa990 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -1,7 +1,6 @@
 # -*- make -*-
 BASE=..
 SUBDIR=doc
-SUBDIRS= $(dir $(wildcard */makefile))
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
@@ -13,34 +12,6 @@ include $(DEBIANDOC_H)
 
 doc: manpages debiandoc
 
-# Do not use XMLTO, build the manpages directly with XSLTPROC
-ifdef XSLTPROC
-# generate a list of accepted man page translations
-SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
-INCLUDES = apt.ent apt-verbatim.ent
-STYLESHEET=manpage-style.xsl
-
-LOCAL := manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-manpages: $($(LOCAL)-LIST)
-
-$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
-	echo Creating man page $@
-	$(XSLTPROC) -o $@ $(STYLESHEET) $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-endif
-
-# Chain to the manpage rule
-SOURCE = apt.8
-include $(MANPAGE_H)
-
 examples/sources.list: examples/sources.list.in apt-verbatim.ent
 	sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^<!ENTITY ubuntu-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
 
@@ -50,42 +21,43 @@ TO = $(DOC)
 TARGET = binary
 include $(COPY_H)
 
-.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats
+.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats
 
-clean: clean-subdirs
-veryclean: veryclean-subdirs
+clean: clean/subdirs
+veryclean: veryclean/subdirs
+manpages: manpages/subdirs
+debiandoc: debiandoc/subdirs
 
-clean-subdirs:
-	for dir in $(SUBDIRS); do\
-		$(MAKE) -C $$dir clean; \
-	done
+DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
+DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))
 
-veryclean-subdirs:
-	for dir in $(SUBDIRS); do\
-		rm -rf $$dir; \
+dirs: $(DOCDIRLIST)
+$(DOCDIRLIST) :: %/makefile : lang.makefile
+	test -d $(dir $@) || mkdir $(dir $@)
+	sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@
+
+debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
+	for dir in en $(dir $(DOCDIRLIST)); do \
+		$(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \
 	done
 
 stats:
 	for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
 
 ifdef PO4A
-DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
 MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO))
 DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO))
 
-MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))
+.PHONY: update-po po4a $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) $(DOCDIRLIST)
 
-.PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST)
-
-manpages: $(MANPAGEPOLIST)
-debiandoc: $(DEBIANDOCPOLIST)
-po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST)
+po4a: manpages/subdirs debiandoc/subdirs
 
 update-po:
 	po4a --previous --no-backups --force --no-translations \
 		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 
+manpages/subdirs: $(MANPAGEPOLIST)
 $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
 	# first line is for apt.8 (see Bug#696923)
 	po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
@@ -100,19 +72,13 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
 		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \
 		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
-	$(MAKE) -C $(dir $<) manpages
 
+debiandoc/subdirs: $(DEBIANDOCPOLIST)
 $(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf
 	po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
 		$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \
 		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
-	$(MAKE) -C $(dir $<) debiandoc
-
-dirs: $(MANPAGEDIRLIST)
-$(MANPAGEDIRLIST) :: %/makefile : lang.makefile
-	test -d $(dir $@) || mkdir $(dir $@)
-	sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@
 endif
 
 ifdef DOXYGEN
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index b20761bf9..43c184106 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.7.9~exp3ubuntu1\n"
+"Project-Id-Version: apt-doc 0.9.8.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1105,12 +1105,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "See Also"
 msgstr ""
 
@@ -1620,8 +1620,8 @@ msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
 "shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
-"Ubuntu."
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:184
-msgid "Keyring of Ubuntu archive trusted keys."
+msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:187
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:188
-msgid "Keyring of Ubuntu archive removed trusted keys."
+msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2332,20 +2332,19 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in "
-"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
-"guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2355,7 +2354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2367,7 +2366,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2377,7 +2376,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2389,7 +2388,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2406,19 +2405,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2426,7 +2425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2440,7 +2439,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2449,14 +2448,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2465,7 +2464,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -2480,7 +2479,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2497,7 +2496,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -2508,7 +2507,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -2521,7 +2520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -2542,38 +2541,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2581,7 +2580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2594,7 +2593,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2606,7 +2605,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2618,7 +2617,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2626,7 +2625,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2638,7 +2637,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2648,21 +2647,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 "URIs. It is in the standard form of "
@@ -2675,7 +2674,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2687,14 +2686,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
@@ -2706,14 +2705,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2723,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -2731,7 +2730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2742,7 +2741,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2766,7 +2765,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of "
@@ -2787,7 +2786,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -2797,7 +2796,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -2807,7 +2806,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2817,13 +2816,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -2836,7 +2835,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is "
 "<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -2844,7 +2843,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -2852,7 +2851,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -2864,19 +2863,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -2894,13 +2893,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -2916,7 +2915,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -2924,7 +2923,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2933,7 +2932,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -2945,13 +2944,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -2973,7 +2972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -2983,22 +2982,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3010,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3023,7 +3022,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3033,7 +3032,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3041,7 +3040,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3053,7 +3052,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3066,7 +3065,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3077,12 +3076,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3090,7 +3089,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3104,40 +3103,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3145,7 +3144,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3154,7 +3153,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3164,7 +3163,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3175,26 +3174,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3209,7 +3208,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3219,7 +3218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -3233,7 +3232,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -3246,7 +3245,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is "
@@ -3264,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
@@ -3276,7 +3275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3287,7 +3286,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3299,7 +3298,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3313,12 +3312,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3327,12 +3326,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3343,7 +3342,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3351,7 +3350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -3359,7 +3358,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3369,65 +3368,65 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3435,52 +3434,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -3490,7 +3489,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -3508,45 +3507,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3554,19 +3553,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3574,7 +3573,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
diff --git a/doc/po/de.po b/doc/po/de.po
index e2052297f..7ef5d39c0 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2012-06-25 22:49+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -763,9 +767,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1543,14 +1547,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3274,15 +3278,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
-"Im Allgemeinen bietet die Beispielkonfigurationsdatei in <filename>&docdir;"
-"examples/apt.conf</filename> &configureindex; eine gute Anleitung, wie dies "
-"aussehen kรถnnte."
+"Im Allgemeinen bietet die Beispielkonfigurationsdatei &configureindex; eine "
+"gute Anleitung, wie dies aussehen kรถnnte."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3292,7 +3295,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> benutzen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3308,7 +3311,7 @@ msgstr ""
 "รผberschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3328,7 +3331,7 @@ msgstr ""
 "(Beachten Sie, dass diese Zeilen auch mit einem Schrรคgstrich enden mรผssen.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3345,7 +3348,7 @@ msgstr ""
 "nicht auรŸer Kraft gesetzt, sondern nur bereinigt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3365,7 +3368,7 @@ msgstr ""
 "Befehlszeile benutzt werden.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3397,12 +3400,12 @@ msgstr ""
 "beklagt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr "Die APT-Gruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3411,7 +3414,7 @@ msgstr ""
 "wie es die Optionen fรผr alle Werkzeuge enthรคlt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3422,7 +3425,7 @@ msgstr ""
 "die Architektur fรผr die APT kompiliert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3444,7 +3447,7 @@ msgstr ""
 "print-architectures</command> registriert werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3457,7 +3460,7 @@ msgstr ""
 "codename;ยซ, ยป4.0ยซ, ยป5.0*ยซ. Siehe auch &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3466,7 +3469,7 @@ msgstr ""
 "Problemlรถser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3481,7 +3484,7 @@ msgstr ""
 "Mรถglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3509,7 +3512,7 @@ msgstr ""
 "Abhรคngigkeit von A nicht lรคnger erfรผllt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3539,7 +3542,7 @@ msgstr ""
 "Stelle verhindern kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3557,7 +3560,7 @@ msgstr ""
 "des Upgrade-Prozesses arbeiten kรถnnen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3579,7 +3582,7 @@ msgstr ""
 "davon abhรคngt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3616,13 +3619,13 @@ msgstr ""
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "definiert, welche Pakete als essentielle Bauabhรคngigkeiten betrachtet werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3632,7 +3635,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3642,7 +3645,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3652,12 +3655,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3668,7 +3671,7 @@ msgstr ""
 "Herunterladen selbst zustรคndig sind (siehe auch &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3690,7 +3693,7 @@ msgstr ""
 "ValidTime</literal> unten benutzt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3709,7 +3712,7 @@ msgstr ""
 "Anhรคngen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3729,7 +3732,7 @@ msgstr ""
 "Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3740,7 +3743,7 @@ msgstr ""
 "der kompletten Dateien. Vorgabe ist True."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3758,7 +3761,7 @@ msgstr ""
 "komplette Datei anstelle der Patche heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3774,7 +3777,7 @@ msgstr ""
 "URI-Art geรถffnet wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3783,7 +3786,7 @@ msgstr ""
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3793,7 +3796,7 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3804,15 +3807,15 @@ msgid ""
 "be used."
 msgstr ""
 "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er "
-"wird standardmรครŸig in der Form <literal>http://[[Anwender][:Passwort]@]"
-"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann auรŸerdem in "
-"der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem speziellen "
-"Schlรผsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies "
-"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird "
-"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
+"wird standardmรครŸig in der Form <literal>http://[[Anwender][:"
+"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann "
+"auรŸerdem in der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem "
+"speziellen Schlรผsselwort <literal>DIRECT</literal> angegeben werden, dass "
+"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben "
+"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3833,7 +3836,7 @@ msgstr ""
 "Zwischenspeicher mit (groรŸen) .deb-Dateien verunreinigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3843,7 +3846,7 @@ msgstr ""
 "Datenzeitรผberschreitungen angewandt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3863,7 +3866,7 @@ msgstr ""
 "HTTP/1.1-Spezifikation entsprechen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3872,7 +3875,7 @@ msgstr ""
 "folgen wird, was standardmรครŸig aktiviert ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3888,7 +3891,7 @@ msgstr ""
 "deaktiviert.)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3900,7 +3903,7 @@ msgstr ""
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3917,7 +3920,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstรผtzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3958,7 +3961,7 @@ msgstr ""
 "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3993,7 +3996,7 @@ msgstr ""
 "literal> und <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4010,7 +4013,7 @@ msgstr ""
 "Musterkonfigurationsdatei)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4024,7 +4027,7 @@ msgstr ""
 "Effizienz nicht empfohlen FTP รผber HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4040,13 +4043,13 @@ msgstr ""
 "Server RFC2428 unterstรผtzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4068,7 +4071,7 @@ msgstr ""
 "Aushรคngebefehle kรถnnen per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4077,13 +4080,13 @@ msgstr ""
 "literal>, um zusรคtzliche Parameter an Gpgv weiterzuleiten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4103,19 +4106,19 @@ msgstr ""
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4147,13 +4150,13 @@ msgstr ""
 "explizit zur Liste hinzuzufรผgen, da es automatisch hinzufรผgt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4179,7 +4182,7 @@ msgstr ""
 "nicht รผberschreiben, es wird diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4191,7 +4194,7 @@ msgstr ""
 "dies meist nur fรผr lokale Spiegel benutzt werden kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4205,7 +4208,7 @@ msgstr ""
 "False."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4225,13 +4228,13 @@ msgstr ""
 "langen Sprachcodes selten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4272,7 +4275,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4286,22 +4289,22 @@ msgstr ""
 "Liste hinzugefรผgt (nach einem impliziten ยป<literal>none</literal>ยซ)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr "Verzeichnisse"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4321,7 +4324,7 @@ msgstr ""
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4344,7 +4347,7 @@ msgstr ""
 "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4359,7 +4362,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4371,7 +4374,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4389,7 +4392,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4409,7 +4412,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4427,12 +4430,12 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4443,7 +4446,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4466,7 +4469,7 @@ msgstr ""
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4475,7 +4478,7 @@ msgstr ""
 "รผbermittelt, wenn es fรผr die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4484,7 +4487,7 @@ msgstr ""
 "รผbermittelt, wenn es fรผr die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4493,12 +4496,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr "Wie APT &dpkg; aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4507,7 +4510,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4518,7 +4521,7 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; รผbermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4532,7 +4535,7 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4548,7 +4551,7 @@ msgstr ""
 "die es installieren wird, auf der Standardeingabe รผbergeben, einen pro Zeile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4564,7 +4567,7 @@ msgstr ""
 "literal> gegeben wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4573,7 +4576,7 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4583,12 +4586,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehรถrige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4615,7 +4618,7 @@ msgstr ""
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4629,7 +4632,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4654,7 +4657,7 @@ msgstr ""
 "Optionenkombination wรคre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4677,7 +4680,7 @@ msgstr ""
 "anhรคngen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4707,7 +4710,7 @@ msgstr ""
 "enden kรถnnte und mรถglicherweise nicht mehr startbar ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4726,7 +4729,7 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4742,7 +4745,7 @@ msgstr ""
 "benรถtigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4760,7 +4763,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4784,12 +4787,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4803,12 +4806,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4826,7 +4829,7 @@ msgstr ""
 "kรถnnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4837,7 +4840,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4848,7 +4851,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszufรผhren."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4860,7 +4863,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4869,12 +4872,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollstรคndige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4882,28 +4885,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4912,7 +4915,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4921,13 +4924,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflรถsung von Bauabhรคngigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4936,7 +4939,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4947,7 +4950,7 @@ msgstr ""
 "ID fรผr eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4957,14 +4960,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefรผgt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4973,7 +4976,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4982,7 +4985,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -4992,7 +4995,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5000,7 +5003,7 @@ msgstr ""
 "durchfรผhren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5010,7 +5013,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5026,7 +5029,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5048,18 +5051,18 @@ msgstr ""
 "auslรถsen. Sie werden nach zwei eingerรผckten Leerzeichen unter dem "
 "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</"
 "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> "
-"gefolgt von <literal>Paketname &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (Abschnitt)"
-"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes "
-"ist, <literal>d.e.f</literal> die Version ist, die zur Installation "
-"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die "
-"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-"
-"Bewertung). Die letzten beiden kรถnnen weggelassen werden, wenn es keine gibt "
-"oder wenn sie die gleiche Version haben, wie die, die installiert ist. "
-"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket "
-"erscheint."
+"gefolgt von <literal>Paketname &lt;a.b.c -&gt; d.e.f | x.y.z&gt; "
+"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version "
+"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur "
+"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version "
+"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer "
+"niedrigen Pinning-Bewertung). Die letzten beiden kรถnnen weggelassen werden, "
+"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die "
+"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in "
+"dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5069,7 +5072,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5078,7 +5081,7 @@ msgstr ""
 "und alle wรคhrend deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5088,7 +5091,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5096,12 +5099,12 @@ msgstr ""
 "von &dpkg; ausgefรผhrt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Prioritรคt jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5111,7 +5114,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5123,7 +5126,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5132,13 +5135,13 @@ msgstr ""
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5148,7 +5151,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6301,9 +6304,9 @@ msgid ""
 "id=\"0\"/>"
 msgstr ""
 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste"
-"(n) <literal>stable</literal>-Version(en) durchzufรผhren. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
+"neuste(n) <literal>stable</literal>-Version(en) durchzufรผhren. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:584
@@ -6384,9 +6387,9 @@ msgid ""
 "id=\"0\"/>"
 msgstr ""
 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste"
-"(n) <literal>testing</literal>-Version(en) durchzufรผhren. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
+"neuste(n) <literal>testing</literal>-Version(en) durchzufรผhren. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:633
@@ -6489,8 +6492,8 @@ msgid ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
-"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
+"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
 "literal> durchzufรผhren. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -6658,13 +6661,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> kรถnnte auรŸerdem eine Variable, <literal>"
 "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie "
@@ -8183,9 +8186,9 @@ msgstr "BESCHREIBUNG"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT ist ein Verwaltungssystem fรผr Softwarepakete. Fรผr normale alltรคgliche "
 "Paketverwaltung sind mehrere Oberflรคchen, wie B<aptitude>(8) fรผr die "
@@ -8770,9 +8773,9 @@ msgstr ""
 "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
 "Verfรผgbarkeitsliste zu aktualisieren, indem sie aus dem Menรผ [E]rneuern "
 "auswรคhlen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfรผgung stellt. [E]"
-"rneuern muss auch dann durchgefรผhrt werden, wenn vorher <tt>apt-get update</"
-"tt> ausgefรผhrt wurde."
+"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfรผgung stellt. "
+"[E]rneuern muss auch dann durchgefรผhrt werden, wenn vorher <tt>apt-get "
+"update</tt> ausgefรผhrt wurde."
 
 #. type: <p></p>
 #: guide.sgml:253
diff --git a/doc/po/es.po b/doc/po/es.po
index bfdfd6372..a6fbc5da2 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2012-07-14 12:21+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -848,9 +852,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1619,14 +1623,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3335,15 +3339,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
-"En general, el fichero de configuraciรณn de ejemplo <filename>&docdir;"
-"examples/apt.conf</filename> &configureindex; es una buena guรญa para "
-"entender su aspecto."
+"En general, el fichero de configuraciรณn de ejemplo &configureindex; es una "
+"buena guรญa para entender su aspecto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3353,7 +3356,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3368,7 +3371,7 @@ msgstr ""
 "cualquier otra opciรณn reasignando un nuevo valor a la opciรณn."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3388,7 +3391,7 @@ msgstr ""
 "acabar con punto y coma)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3404,7 +3407,7 @@ msgstr ""
 "los รกmbitos no se pueden redefinir, sรณlo eliminar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3423,7 +3426,7 @@ msgstr ""
 "sintaxis de รกmbitos en la lรญnea de รณrdenes)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3453,12 +3456,12 @@ msgstr ""
 "declaraciones ahora que APT no muestra fallos de forma explรญcita."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr "El grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3467,7 +3470,7 @@ msgstr ""
 "mantiene las opciones para todas las herramientas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3478,7 +3481,7 @@ msgstr ""
 "arquitectura para la que apt se compilรณ."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3500,7 +3503,7 @@ msgstr ""
 "add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3514,7 +3517,7 @@ msgstr ""
 "ยซ5.0*ยป. Consulte tambiรฉn &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3523,7 +3526,7 @@ msgstr ""
 "problemas ignore los paquetes retenidos en la toma de decisiones."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3537,7 +3540,7 @@ msgstr ""
 "mecanismo directo para reinstalarlos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3564,7 +3567,7 @@ msgstr ""
 "del paquete A, ya que no se satisface la dependencia sobre รฉste."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3593,7 +3596,7 @@ msgstr ""
 "anteriormente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3610,7 +3613,7 @@ msgstr ""
 "para que asรญ pueden mejorar y corregir el proceso de actualizaciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3631,7 +3634,7 @@ msgstr ""
 "sobre la que estos paquetes dependen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3668,14 +3671,14 @@ msgstr ""
 "desactiva el crecimiento automรกtico de la cachรฉ."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define los paquetes que se consideran dependencias de construcciรณn "
 "esenciales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3684,7 +3687,7 @@ msgstr ""
 "documentaciรณn para mรกs informaciรณn sobre esta opciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3693,7 +3696,7 @@ msgstr ""
 "documentaciรณn para mรกs informaciรณn sobre esta opciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3702,12 +3705,12 @@ msgstr ""
 "documentaciรณn para mรกs informaciรณn sobre esta opciรณn."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3718,7 +3721,7 @@ msgstr ""
 "sรญ mismo (consulte tambiรฉn &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3739,7 +3742,7 @@ msgstr ""
 "utilizar la opciรณn <literal>Max-ValidTime</literal> a continuaciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3758,7 +3761,7 @@ msgstr ""
 "se pueden realizar aรฑadiendo la etiqueta del archivo al nombre de opciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3778,7 +3781,7 @@ msgstr ""
 "y deben utilizar aรฑadiendo la etiqueta del archivo al nombre de opciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3789,7 +3792,7 @@ msgstr ""
 "enteros. Su valor predeterminado es ยซtrueยป."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3807,7 +3810,7 @@ msgstr ""
 "parches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3822,7 +3825,7 @@ msgstr ""
 "se abrirรก una conexiรณn por cada tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3831,7 +3834,7 @@ msgstr ""
 "intentar obtener los ficheros fallidos el nรบmero de veces proporcionado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3841,7 +3844,7 @@ msgstr ""
 "ยซtrueยป de forma predeterminada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3861,7 +3864,7 @@ msgstr ""
 "opciones anteriores."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3880,7 +3883,7 @@ msgstr ""
 "impedir que el proxy contamine la cachรฉ con ficheros ยซ.debยป (de gran tamaรฑo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3890,7 +3893,7 @@ msgstr ""
 "y a la recepciรณn de datos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3910,7 +3913,7 @@ msgstr ""
 "cumplir la especificaciรณn HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3919,7 +3922,7 @@ msgstr ""
 "redirecciรณn; activado por omisiรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3934,7 +3937,7 @@ msgstr ""
 "implรญcitamente la descarga simultรกnea desde varios servidores)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3945,7 +3948,7 @@ msgstr ""
 "permiten el acceso para clientes que usan un identificador conocido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3962,7 +3965,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4002,7 +4005,7 @@ msgstr ""
 "SslForceVersion</literal> es la opciรณn correspondiente para cada servidor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4035,7 +4038,7 @@ msgstr ""
 "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4052,7 +4055,7 @@ msgstr ""
 "ejemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4066,7 +4069,7 @@ msgstr ""
 "a su poca eficiencia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4082,13 +4085,13 @@ msgstr ""
 "compatibles con la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"algo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4110,7 +4113,7 @@ msgstr ""
 "especificar รณrdenes para desmontar mediante UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4119,13 +4122,13 @@ msgstr ""
 "Options</literal>, que introduce parรกmetros adicionales a gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>extensiรณn-del-fichero</replaceable> \"<replaceable>nombre-del-mรฉtodo</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4145,19 +4148,19 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4189,13 +4192,13 @@ msgstr ""
 "explรญcita ya que se aรฑadirรก de forma automรกtica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4220,7 +4223,7 @@ msgstr ""
 "omite la lista definida, simplemente prefija la lista con este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4232,7 +4235,7 @@ msgstr ""
 "asรญ que habitualmente esto solo sirve con rรฉplicas locales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4246,7 +4249,7 @@ msgstr ""
 "paquetes locales. El valor predeterminado es ยซfalseยป."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4265,13 +4268,13 @@ msgstr ""
 "idioma (especialmente para los cรณdigos de idioma largos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4310,7 +4313,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4324,22 +4327,22 @@ msgstr ""
 "implรญcito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr "Directorios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4360,7 +4363,7 @@ msgstr ""
 "filename> รณ <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4382,7 +4385,7 @@ msgstr ""
 "directorio predeterminado estรก en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4398,7 +4401,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4409,7 +4412,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuraciรณn principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4426,7 +4429,7 @@ msgstr ""
 "literal> especifican la ubicaciรณn de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4447,7 +4450,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4465,12 +4468,12 @@ msgstr ""
 "de expresiones regulares."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4481,7 +4484,7 @@ msgstr ""
 "encuentran en la secciรณn <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4503,7 +4506,7 @@ msgstr ""
 "realiza esta acciรณn antes de descargar paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4512,7 +4515,7 @@ msgstr ""
 "la lรญnea de ordenes al ejecutar la fase de instalaciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4521,7 +4524,7 @@ msgstr ""
 "la lรญnea de ordenes al ejecutar la fase de actualizaciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4531,12 +4534,12 @@ msgstr ""
 "preguntarรก en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr "Invocaciรณn de APT a dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4545,7 +4548,7 @@ msgstr ""
 "se encuentran en la secciรณn <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4556,7 +4559,7 @@ msgstr ""
 "introduce a &dpkg; como un sรณlo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4569,7 +4572,7 @@ msgstr ""
 "sh</filename>; en caso de fallo, APT cancela la acciรณn."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4585,7 +4588,7 @@ msgstr ""
 "la entrada estรกndar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4601,7 +4604,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4610,7 +4613,7 @@ msgstr ""
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4620,12 +4623,12 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4652,7 +4655,7 @@ msgstr ""
 "tiempo (o mรกs) durante la configuraciรณn de todos los paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4666,7 +4669,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4690,7 +4693,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4713,7 +4716,7 @@ msgstr ""
 "eliminaciรณn."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4743,7 +4746,7 @@ msgstr ""
 "imposibilidad de arrancar el sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4761,7 +4764,7 @@ msgstr ""
 "desactivar esta opciรณn en todas las ejecuciones menos la รบltima."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4777,7 +4780,7 @@ msgstr ""
 "los disparadores necesarios para configurar este paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4795,7 +4798,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4820,12 +4823,12 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr "Las opciones ยซPeriodicยป y ยซArchivesยป"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4839,12 +4842,12 @@ msgstr ""
 "documentaciรณn de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr "Opciones de depuraciรณn"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4861,7 +4864,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sรญ son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4872,7 +4875,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4883,7 +4886,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como un usuario normal."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4895,7 +4898,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4904,14 +4907,14 @@ msgstr ""
 "statfs en los identificadores de los discos รณpticos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 "A continuaciรณn, se muestra la lista completa de las opciones de depuraciรณn "
 "de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4919,26 +4922,26 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Muestra la informaciรณn relacionada con la descarga de paquetes mediante FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la informaciรณn relacionada con la descarga de paquetes mediante HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Muestra la informaciรณn relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4947,7 +4950,7 @@ msgstr ""
 "criptogrรกficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4956,14 +4959,14 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Describe el proceso de resoluciรณn de dependencias de compilaciรณn en &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4972,7 +4975,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4983,7 +4986,7 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4993,14 +4996,14 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra los elementos que se aรฑaden o se borran de la cola de descarga "
 "global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5010,7 +5013,7 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5019,7 +5022,7 @@ msgstr ""
 "lista de รญndices de paquetes, y los errores relacionados con รฉstos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5029,7 +5032,7 @@ msgstr ""
 "รญndices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5037,7 +5040,7 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5046,7 +5049,7 @@ msgstr ""
 "de los paquetes y con la eliminaciรณn de los paquetes sin usar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5062,7 +5065,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5093,7 +5096,7 @@ msgstr ""
 "la secciรณn en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5102,7 +5105,7 @@ msgstr ""
 "invocรณ, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5111,7 +5114,7 @@ msgstr ""
 "estado y cualquier error encontrado durante el anรกlisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5120,7 +5123,7 @@ msgstr ""
 "literal> deberรญa entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5128,12 +5131,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5142,7 +5145,7 @@ msgstr ""
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5153,7 +5156,7 @@ msgstr ""
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5162,13 +5165,13 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5178,7 +5181,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6681,18 +6684,18 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
-msgstr ""
-"<literal>distribuciรณn</literal> puede contener una variable, <literal>$(ARCH)"
-"</literal>, que se expandirรก a la arquitectura de Debian usada en el sistema "
-"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto "
-"permite que los ficheros <filename>sources.list</filename> sean "
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
+msgstr ""
+"<literal>distribuciรณn</literal> puede contener una variable, <literal>"
+"$(ARCH)</literal>, que se expandirรก a la arquitectura de Debian usada en el "
+"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). "
+"Esto permite que los ficheros <filename>sources.list</filename> sean "
 "independientes de la arquitectura. En general, esta caracterรญstica sรณlo es "
 "de interรฉs si se especifica una ruta completa, de lo contrario <literal>APT</"
 "literal> generarรก automรกticamente una URI con la arquitectura actual del "
@@ -8196,9 +8199,9 @@ msgstr "DESCRIPCIร“N"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT es un sistema de gestiรณn de paquetes de software. Dispone de varias "
 "interfaces para la gestiรณn de paquetes normal del dรญa a dรญa, tales como "
@@ -8768,9 +8771,9 @@ msgid ""
 "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
 "tt> has been run before."
 msgstr ""
-"Es necesario actualizar la lista disponible mediante el elemento de menรบ [A]"
-"ctualizar antes de iniciar <prgn>dselect</prgn>. ร‰ste es un superconjunto de "
-"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
+"Es necesario actualizar la lista disponible mediante el elemento de menรบ "
+"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. ร‰ste es un superconjunto "
+"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
 "informaciรณn obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
 "<tt>apt-get update</tt> con anterioridad."
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 5c7f521c9..41358cfa2 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2013-04-09 07:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -760,9 +764,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -824,10 +828,10 @@ msgstr ""
 "dรฉjร  installรฉs sans mettre ร  jour les autres paquets du systรจme. ร€ la "
 "diffรฉrence de la commande ยซย upgradeย ยป qui installera la derniรจre version "
 "disponible de tous les paquets installรฉs au moment de son exรฉcution, "
-"ยซย installย ยป n'installera la nouvelle version que pour le(s) paquet(s) indiquรฉ"
-"(s). Il suffit de fournir le nom du(des) paquet(s) ร  mettre ร  jour et si une "
-"nouvelle version est disponible, cette version (et ses dรฉpendances, comme "
-"dรฉcrit plus haut) sera rรฉcupรฉrรฉe et installรฉe."
+"ยซย installย ยป n'installera la nouvelle version que pour le(s) paquet(s) "
+"indiquรฉ(s). Il suffit de fournir le nom du(des) paquet(s) ร  mettre ร  jour et "
+"si une nouvelle version est disponible, cette version (et ses dรฉpendances, "
+"comme dรฉcrit plus haut) sera rรฉcupรฉrรฉe et installรฉe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:137
@@ -1538,14 +1542,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3264,15 +3268,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
-"Les modรจles <filename>&docdir;examples/apt.conf</filename> et "
-"&configureindex; montrent ร  quoi devrait ressembler le fichier de "
-"configuration."
+"Les modรจles &configureindex; montrent ร  quoi devrait ressembler le fichier "
+"de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3282,7 +3285,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3298,7 +3301,7 @@ msgstr ""
 "rรฉaffectant une valeur."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3318,7 +3321,7 @@ msgstr ""
 "รฉgalement se terminer avec un point-virgule."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3334,7 +3337,7 @@ msgstr ""
 "peuvent รชtre remplacรฉs mais seulement effacรฉs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3353,7 +3356,7 @@ msgstr ""
 "champ d'action (ยซย scopeย ยป) ne peut pas รชtre indiquรฉe ร  la ligne de commande."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3385,12 +3388,12 @@ msgstr ""
 "explicitement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr "Le groupe APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3399,7 +3402,7 @@ msgstr ""
 "รฉgalement des options communes ร  tous les outils."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3410,7 +3413,7 @@ msgstr ""
 "valeur interne par dรฉfaut est l'architecture pour laquelle APT a รฉtรฉ compilรฉ."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3432,7 +3435,7 @@ msgstr ""
 "sont enregistrรฉes avec <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3446,7 +3449,7 @@ msgstr ""
 "&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3456,7 +3459,7 @@ msgstr ""
 "dรฉcision."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3470,7 +3473,7 @@ msgstr ""
 "direct pour les rรฉinstaller."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3497,7 +3500,7 @@ msgstr ""
 "dรฉpendances ne sont pas satisfaites."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3526,7 +3529,7 @@ msgstr ""
 "le seul qu'elle permet d'รฉviter."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3544,7 +3547,7 @@ msgstr ""
 "corriger les processus de mise ร  jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3566,7 +3569,7 @@ msgstr ""
 "tous les paquets dont ces paquets dรฉpendent."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3606,14 +3609,14 @@ msgstr ""
 "l'augmentation automatique de la taille du cache est dรฉsactivรฉe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Cette option dรฉfinit les paquets qui sont considรฉrรฉs comme faisant partie "
 "des dรฉpendances essentielles pour la construction de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3623,7 +3626,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3633,7 +3636,7 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3643,12 +3646,12 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3659,7 +3662,7 @@ msgstr ""
 "effectuent ce tรฉlรฉchargement (voir aussi &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3680,7 +3683,7 @@ msgstr ""
 "alors utilisรฉe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3699,7 +3702,7 @@ msgstr ""
 "l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3719,7 +3722,7 @@ msgstr ""
 "nom de l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3730,7 +3733,7 @@ msgstr ""
 "filename>), plutรดt que de les tรฉlรฉcharger entiรจrement. Par dรฉfaut ร  ยซย trueย ยป."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3749,7 +3752,7 @@ msgstr ""
 "fichiers de diffรฉrences."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3765,7 +3768,7 @@ msgstr ""
 "initiรฉe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3775,7 +3778,7 @@ msgstr ""
 "รฉchouรฉ."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3785,7 +3788,7 @@ msgstr ""
 "archives de sources au lieu de les copier.  Par dรฉfaut ร  ยซย trueย ยป."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3806,7 +3809,7 @@ msgstr ""
 "options de mandataire HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3826,7 +3829,7 @@ msgstr ""
 "fichiers .deb trรจs grands."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3836,7 +3839,7 @@ msgstr ""
 "connexion qu'aux donnรฉes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3856,7 +3859,7 @@ msgstr ""
 "qui ne respectent pas la norme HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3865,7 +3868,7 @@ msgstr ""
 "suive les redirections. Ce rรฉglage est activรฉ par dรฉfaut."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3880,7 +3883,7 @@ msgstr ""
 "implicitement le tรฉlรฉchargement simultanรฉ depuis plusieurs serveurs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3892,7 +3895,7 @@ msgstr ""
 "n'autorisent l'accรจs qu'aux client s'identifiant de maniรจre spรฉcifique.."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3909,7 +3912,7 @@ msgstr ""
 "literal> n'est pas encore gรฉrรฉe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3942,7 +3945,7 @@ msgstr ""
 "<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3978,7 +3981,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3995,7 +3998,7 @@ msgstr ""
 "modรจle de fichier de configuration)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4010,7 +4013,7 @@ msgstr ""
 "efficacitรฉ de cette mรฉthode."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4026,13 +4029,13 @@ msgstr ""
 "des serveurs FTP ne suivent pas la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4055,7 +4058,7 @@ msgstr ""
 "<literal>UMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4064,13 +4067,13 @@ msgstr ""
 "permet de passer des paramรจtres ร  gpgv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4090,19 +4093,19 @@ msgstr ""
 "type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4134,13 +4137,13 @@ msgstr ""
 "<literal>bz2</literal> ร  liste car il sera ajoutรฉ automatiquement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4167,7 +4170,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4179,7 +4182,7 @@ msgstr ""
 "surtout destinรฉ aux miroirs locaux."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4194,7 +4197,7 @@ msgstr ""
 "(ยซย Falseย ยป)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4214,13 +4217,13 @@ msgstr ""
 "langues รฉtant particuliรจrement rares."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4260,7 +4263,7 @@ msgstr ""
 "alors ยซย de, fr, enย ยป. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4274,22 +4277,22 @@ msgstr ""
 "(aprรจs un ยซย <literal>none</literal>ย ยป implicite)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Utilisation imposรฉe du protocole IPv4 lors des tรฉlรฉchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Utilisation imposรฉe du protocole IPv6 lors des tรฉlรฉchargements."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr "Les rรฉpertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4309,7 +4312,7 @@ msgstr ""
 "<filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4332,7 +4335,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4347,7 +4350,7 @@ msgstr ""
 "fichier de configuration indiquรฉ par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4358,7 +4361,7 @@ msgstr ""
 "configuration est chargรฉ."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4376,7 +4379,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4398,7 +4401,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4416,12 +4419,12 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4432,7 +4435,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4455,7 +4458,7 @@ msgstr ""
 "avant de rรฉcupรฉrer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4464,7 +4467,7 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4473,7 +4476,7 @@ msgstr ""
 "&apt-get; lors de la phase de mise ร  jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4483,12 +4486,12 @@ msgstr ""
 "d'erreur que l'on propose ร  l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr "Mรฉthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4497,7 +4500,7 @@ msgstr ""
 "&dpkg;ย : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4508,7 +4511,7 @@ msgstr ""
 "est passรฉ comme un seul paramรจtre ร  &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4521,7 +4524,7 @@ msgstr ""
 "<filename>/bin/sh</filename>ย : APT s'arrรชte dรจs que l'une d'elles รฉchoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4537,7 +4540,7 @@ msgstr ""
 "qu'il va installer, ร  raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4553,7 +4556,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4562,7 +4565,7 @@ msgstr ""
 "le rรฉpertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4572,14 +4575,14 @@ msgstr ""
 "crรฉรฉs."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions diffรฉrรฉes (ยซย triggersย ยป) de dpkg (et options "
 "associรฉes)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4606,7 +4609,7 @@ msgstr ""
 "pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4620,7 +4623,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4644,7 +4647,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4667,7 +4670,7 @@ msgstr ""
 "options ยซย unpackย ยป et ยซย removeย ยป."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4697,7 +4700,7 @@ msgstr ""
 "configurรฉ et donc รฉventuellement non amorรงable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4716,7 +4719,7 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4734,7 +4737,7 @@ msgstr ""
 "celles concernant le paquet en cours de traitement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4752,7 +4755,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4778,12 +4781,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr "Options ยซย Periodicย ยป et ยซย Archiveย ยป"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4795,12 +4798,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancรฉ quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr "Les options de dรฉbogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4818,7 +4821,7 @@ msgstr ""
 "peuvent tout de mรชme รชtre utilesย :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4829,7 +4832,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4841,7 +4844,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4853,7 +4856,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4862,12 +4865,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complรจte des options de dรฉbogage de APTย :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4875,24 +4878,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le tรฉlรฉchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le tรฉlรฉchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4901,7 +4904,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4910,14 +4913,14 @@ msgstr ""
 "stockรฉes sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Dรฉcrit le processus de rรฉsolution des dรฉpendances pour la construction de "
 "paquets source (ย ยซย build-dependenciesย ยปย ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4926,7 +4929,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4937,7 +4940,7 @@ msgstr ""
 "utilisรฉs sur le systรจme de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4947,14 +4950,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'รฉlรฉments de la queue globale de "
 "tรฉlรฉchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4964,7 +4967,7 @@ msgstr ""
 "รฉventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4974,7 +4977,7 @@ msgstr ""
 "รฉventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -4984,7 +4987,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -4992,7 +4995,7 @@ msgstr ""
 "effectivement des tรฉlรฉchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5001,7 +5004,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5016,7 +5019,7 @@ msgstr ""
 "de APTย ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5052,7 +5055,7 @@ msgstr ""
 "de APTย ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5061,7 +5064,7 @@ msgstr ""
 "paramรจtres sont sรฉparรฉs par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5071,7 +5074,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5080,18 +5083,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets ร  &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le dรฉtail des opรฉrations liรฉes ร  l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la prioritรฉ de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5100,7 +5103,7 @@ msgstr ""
 "concerne que les cas oรน un problรจme de dรฉpendances complexe se prรฉsente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5111,7 +5114,7 @@ msgstr ""
 "est dรฉcrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5120,13 +5123,13 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5136,7 +5139,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6629,13 +6632,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> peut aussi contenir une variable <literal>"
 "$(ARCH)</literal>, qui sera remplacรฉe par l'architecture Debian (comme "
@@ -8139,9 +8142,9 @@ msgstr "DESCRIPTION"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT est un systรจme de gestion de paquets logiciels. Pour la gestion au "
 "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en "
@@ -8755,11 +8758,11 @@ msgid ""
 "[R]emove commands have no meaning, the [I]nstall command performs both of "
 "them together."
 msgstr ""
-"Une fois cela effectuรฉ, vous pouvez poursuivre et utiliser l'option ยซย [S]"
-"รฉlectionnerย ยป pour choisir les paquets ร  installer puis ยซย [I]nstallerย ยป pour "
-"les installer. Lorsque la mรฉthode APT est utilisรฉe, les options ยซย [C]"
-"onfigurerย ยป et ยซย [R]etirerย ยป ne sont pas utilisรฉes, car ยซย [I]nstallerย ยป fait "
-"l'ensemble des opรฉrations."
+"Une fois cela effectuรฉ, vous pouvez poursuivre et utiliser l'option "
+"ยซย [S]รฉlectionnerย ยป pour choisir les paquets ร  installer puis ยซย [I]nstallerย ยป "
+"pour les installer. Lorsque la mรฉthode APT est utilisรฉe, les options "
+"ยซย [C]onfigurerย ยป et ยซย [R]etirerย ยป ne sont pas utilisรฉes, car ยซย [I]nstallerย ยป "
+"fait l'ensemble des opรฉrations."
 
 #. type: <p></p>
 #: guide.sgml:258
diff --git a/doc/po/it.po b/doc/po/it.po
index 59a54917e..f6754c1fb 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2012-12-23 18:04+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -812,9 +816,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1582,14 +1586,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "File"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3299,19 +3303,17 @@ msgstr ""
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
-#  apt.conf รจ un file e &configureindex รจ un altro: configure-index.gz
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
-"In generale i file di configurazione d'esempio in <filename>&docdir;examples/"
-"apt.conf</filename> e &configureindex; sono una buona guida su come debba "
-"essere un file di configurazione."
+"In generale i file di configurazione d'esempio &configureindex; sono una "
+"buona guida su come debba essere un file di configurazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3321,7 +3323,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3336,7 +3338,7 @@ msgstr ""
 "sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3356,7 +3358,7 @@ msgstr ""
 "queste righe devono terminare con un punto e virgola.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3372,7 +3374,7 @@ msgstr ""
 "ambiti non possono essere sovrascritti, solo cancellati."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3392,7 +3394,7 @@ msgstr ""
 "di comando.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3422,12 +3424,12 @@ msgstr ""
 "ora, quando APT ancora non si lamenta esplicitamente."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr "Il gruppo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3436,7 +3438,7 @@ msgstr ""
 "contenere le opzioni per tutti gli strumenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3447,7 +3449,7 @@ msgstr ""
 "predefinito interno รจ l'architettura per la quale apt รจ stato compilato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3469,7 +3471,7 @@ msgstr ""
 "quando sono registrate con <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3483,7 +3485,7 @@ msgstr ""
 "preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3492,7 +3494,7 @@ msgstr ""
 "di problemi ignori i pacchetti bloccati nel suo processo decisionale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3506,7 +3508,7 @@ msgstr ""
 "reinstallarli."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3533,7 +3535,7 @@ msgstr ""
 "che dipende da A, dato che la dipendenza da A non รจ piรน soddisfatta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3563,7 +3565,7 @@ msgstr ""
 "l'unico problema che puรฒ aiutare a prevenire."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3581,7 +3583,7 @@ msgstr ""
 "il processo di aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3602,7 +3604,7 @@ msgstr ""
 "<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3640,14 +3642,14 @@ msgstr ""
 "della cache รจ disabilitata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Definisce quali pacchetti sono considerati dipendenze di compilazione "
 "essenziali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3656,7 +3658,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3665,7 +3667,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3674,12 +3676,12 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr "Il gruppo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3690,7 +3692,7 @@ msgstr ""
 "scaricamento stesso (vedere anche &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3712,7 +3714,7 @@ msgstr ""
 "ValidTime</literal> seguente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3732,7 +3734,7 @@ msgstr ""
 "dell'archivio in fondo al nome dell'opzione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3752,7 +3754,7 @@ msgstr ""
 "archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3763,7 +3765,7 @@ msgstr ""
 "interamente i nuovi. Attiva in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3781,7 +3783,7 @@ msgstr ""
 "completo invece delle patch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3796,7 +3798,7 @@ msgstr ""
 "literal> significa che viene aperta una connessione per ogni tipo di URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3806,7 +3808,7 @@ msgstr ""
 "ha avuto successo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3817,7 +3819,7 @@ msgstr ""
 "vero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3836,7 +3838,7 @@ msgstr ""
 "la variabile d'ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3856,7 +3858,7 @@ msgstr ""
 "file .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3866,7 +3868,7 @@ msgstr ""
 "quello per i dati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3886,7 +3888,7 @@ msgstr ""
 "con la specifica HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3895,7 +3897,7 @@ msgstr ""
 "meno le ridirezioni che sono abilitate in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3910,7 +3912,7 @@ msgstr ""
 "scaricamento da piรน server contemporaneamente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3922,7 +3924,7 @@ msgstr ""
 "conosciuto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3939,7 +3941,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> non รจ ancora supportata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3980,7 +3982,7 @@ msgstr ""
 "literal> รจ la corrispondente opzione specifica per ciascun host."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4014,7 +4016,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4030,7 +4032,7 @@ msgstr ""
 "uno specifico host (vedere il file di configurazione d'esempio)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4044,7 +4046,7 @@ msgstr ""
 "a causa della sua bassa efficienza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4060,13 +4062,13 @@ msgstr ""
 "parte dei server FTP non supporta la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"pippo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4088,7 +4090,7 @@ msgstr ""
 "comandi per lo smontaggio possono essere specificati usando UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4097,13 +4099,13 @@ msgstr ""
 "literal>, che passa parametri aggiuntivi a gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4122,19 +4124,19 @@ msgstr ""
 "metodo usato. La sintassi รจ: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4165,13 +4167,13 @@ msgstr ""
 "all'elenco, dato che verrร  aggiunto automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4197,7 +4199,7 @@ msgstr ""
 "definito; aggiunge solamente il tipo indicato all'inizio dell'elenco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4209,7 +4211,7 @@ msgstr ""
 "soprattutto per i mirror locali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4223,7 +4225,7 @@ msgstr ""
 "modo predefinito รจ disabilitato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4242,13 +4244,13 @@ msgstr ""
 "codici di lingua lunghi sono particolarmente rari."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4287,7 +4289,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4301,22 +4303,22 @@ msgstr ""
 "implicito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4336,7 +4338,7 @@ msgstr ""
 "<filename>/</filename> o <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4358,7 +4360,7 @@ msgstr ""
 "la directory predefinita รจ contenuta in <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4373,7 +4375,7 @@ msgstr ""
 "configurazione specificato da <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4384,7 +4386,7 @@ msgstr ""
 "termine viene caricato il file di configurazione principale."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4401,7 +4403,7 @@ msgstr ""
 "specificano la posizione dei rispettivi programmi."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4422,7 +4424,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4440,12 +4442,12 @@ msgstr ""
 "questi modelli possono usare una sintassi con espressioni regolari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4456,7 +4458,7 @@ msgstr ""
 "sezione <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4478,7 +4480,7 @@ msgstr ""
 "scaricare i nuovi pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4488,7 +4490,7 @@ msgstr ""
 "installazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4498,7 +4500,7 @@ msgstr ""
 "aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4508,12 +4510,12 @@ msgstr ""
 "solo in caso di errore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr "Come APT invoca &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4522,7 +4524,7 @@ msgstr ""
 "&dpkg;; sono nella sezione <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4533,7 +4535,7 @@ msgstr ""
 "passata a &dpkg; come un singolo argomento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4546,7 +4548,7 @@ msgstr ""
 "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerร  annullando."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4562,7 +4564,7 @@ msgstr ""
 "uno per riga, sullo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4578,7 +4580,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4587,7 +4589,7 @@ msgstr ""
 "valore predefinito รจ <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4597,12 +4599,12 @@ msgstr ""
 "binari."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso dei trigger di dpkg (e relative opzioni)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4630,7 +4632,7 @@ msgstr ""
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4644,7 +4646,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4668,7 +4670,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4690,7 +4692,7 @@ msgstr ""
 "questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4720,7 +4722,7 @@ msgstr ""
 "potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4738,7 +4740,7 @@ msgstr ""
 "si puรฒ disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4754,7 +4756,7 @@ msgstr ""
 "necessari per configurare il pacchetto in questione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4772,7 +4774,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4797,12 +4799,12 @@ msgstr ""
 "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr "Opzioni Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4816,12 +4818,12 @@ msgstr ""
 "all'inizio dello script."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr "Opzioni di debug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4839,7 +4841,7 @@ msgstr ""
 "esserlo:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4850,7 +4852,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4861,7 +4863,7 @@ msgstr ""
 "install</literal>) come utente non root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4873,7 +4875,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4882,37 +4884,37 @@ msgstr ""
 "negli ID dei CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue un elenco completo delle opzioni di debug per apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4921,7 +4923,7 @@ msgstr ""
 "usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4930,14 +4932,14 @@ msgstr ""
 "pacchetti memorizzati su CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4946,7 +4948,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4957,7 +4959,7 @@ msgstr ""
 "system del CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4967,14 +4969,14 @@ msgstr ""
 "contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale "
 "degli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4983,7 +4985,7 @@ msgstr ""
 "codici di controllo e delle firme di cifratura dei file scaricati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4993,7 +4995,7 @@ msgstr ""
 "diff."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5003,7 +5005,7 @@ msgstr ""
 "invece degli indici completi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5011,7 +5013,7 @@ msgstr ""
 "realmente gli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5020,7 +5022,7 @@ msgstr ""
 "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5036,7 +5038,7 @@ msgstr ""
 "pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5068,7 +5070,7 @@ msgstr ""
 "sezione in cui compare il pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5077,7 +5079,7 @@ msgstr ""
 "gli argomenti separati da un singolo carattere di spazio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5086,7 +5088,7 @@ msgstr ""
 "di stato ed ogni errore incontrato durante la sua analisi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5095,7 +5097,7 @@ msgstr ""
 "literal> deve passare i pacchetti a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5103,12 +5105,12 @@ msgstr ""
 "nell'invocazione di &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr "Produce in output la prioritร  di ogni elenco di pacchetti all'avvio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5118,7 +5120,7 @@ msgstr ""
 "dipendenze)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5129,7 +5131,7 @@ msgstr ""
 "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5138,13 +5140,13 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Esempi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5154,7 +5156,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6665,13 +6667,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 "<literal>distribuzione</literal> puรฒ anche contenere una variabile <literal>"
 "$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
@@ -8166,9 +8168,9 @@ msgstr "DESCRIZIONE"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT รจ un sistema di gestione per i pacchetti software. Per la normale "
 "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali "
@@ -8222,8 +8224,8 @@ msgid ""
 "B<reportbug>(1)  command."
 msgstr ""
 "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, "
-"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>"
-"(1)."
+"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
+"B<reportbug>(1)."
 
 #. type: SH
 #: apt.8:51
diff --git a/doc/po/ja.po b/doc/po/ja.po
index cb2ae7f48..866cf0e43 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2012-08-08 07:58+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -800,9 +804,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1530,14 +1534,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "ใƒ•ใ‚กใ‚คใƒซ"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3182,14 +3186,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
-"<filename>&docdir;examples/apt.conf</filename> &configureindex; ใฏไธ€่ˆฌ็š„ใช่จญ"
-"ๅฎšใƒ•ใ‚กใ‚คใƒซใฎใ‚ตใƒณใƒ—ใƒซใงใ™ใ€‚ใฉใฎใ‚ˆใ†ใซ่จญๅฎšใ™ใ‚‹ใ‹ๅ‚่€ƒใซใชใ‚‹ใงใ—ใ‚‡ใ†ใ€‚"
+"&configureindex; ใฏไธ€่ˆฌ็š„ใช่จญๅฎšใƒ•ใ‚กใ‚คใƒซใฎใ‚ตใƒณใƒ—ใƒซใงใ™ใ€‚ใฉใฎใ‚ˆใ†ใซ่จญๅฎšใ™ใ‚‹ใ‹ๅ‚"
+"่€ƒใซใชใ‚‹ใงใ—ใ‚‡ใ†ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3198,7 +3202,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> ใจใ™ใ‚‹ใ“ใจใ‚‚ใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3213,7 +3217,7 @@ msgstr ""
 "ใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3232,7 +3236,7 @@ msgstr ""
 "ใŒใ‚ใ‚‹ใ“ใจใซๆณจๆ„ใ—ใฆใใ ใ•ใ„)ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3247,7 +3251,7 @@ msgstr ""
 "ใ›ใ‚“ใ€‚ใ‚ฏใƒชใ‚ขใ•ใ‚Œใ‚‹ใ ใ‘ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3265,7 +3269,7 @@ msgstr ""
 "ใ‚“)ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3293,12 +3297,12 @@ msgstr ""
 "ใ‹ใชใ„้™ใ‚Šใฏใ€่‡ชๅˆ†ใงใใฎใ‚ˆใ†ใชๆง‹ๆ–‡ใ‚’ไฟฎๆญฃใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr "APT ใ‚ฐใƒซใƒผใƒ—"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3307,7 +3311,7 @@ msgstr ""
 "ๅพกใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3318,7 +3322,7 @@ msgstr ""
 "ใƒซใ—ใŸใ‚ขใƒผใ‚ญใƒ†ใ‚ฏใƒใƒฃใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3339,7 +3343,7 @@ msgstr ""
 "ๅŠ ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3352,7 +3356,7 @@ msgstr ""
 "'4.0', '5.0*'  ใจใชใ‚Šใพใ™ใ€‚&apt-preferences; ใ‚‚ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3361,7 +3365,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’็„ก่ฆ–ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3375,7 +3379,7 @@ msgstr ""
 "ๆณจๆ„ใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3399,7 +3403,7 @@ msgstr ""
 "ใชใ‚Šใ€A ใธใฎไพๅญ˜้–ขไฟ‚ใฏใ€ใ‚‚ใ†ๆบ€ใŸใ›ใพใ›ใ‚“ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3424,7 +3428,7 @@ msgstr ""
 "่ฟฐใฎใ‚ทใƒŠใƒชใ‚ชใ‚’่งฃๆฑบใ™ใ‚‹ๆ–นๆณ•ใฎใ€1ใคใซใ—ใ‹ใ™ใŽใชใ„ใฎใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3440,7 +3444,7 @@ msgstr ""
 "ใ‚‚ๅ ฑๅ‘Šใ—ใฆใ„ใŸใ ใใŸใ„ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3461,7 +3465,7 @@ msgstr ""
 "ใใ‚Œใ‚‰ใŒไพๅญ˜ใ—ใฆใ„ใ‚‹ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธไปฅๅค–ใฎไธๅฏๆฌ ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใงๅ‹•ไฝœใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3495,12 +3499,12 @@ msgstr ""
 "ใฎ่‡ชๅ‹•ๅข—ๅŠ ใ‚’็„กๅŠนใซใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr "ๆง‹็ฏ‰ไพๅญ˜้–ขไฟ‚ใงไธๅฏๆฌ ใชใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’ๅฎš็พฉใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3509,7 +3513,7 @@ msgstr ""
 "&apt-get; ใฎๆ–‡ๆ›ธใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3518,7 +3522,7 @@ msgstr ""
 "ใฏ &apt-cache; ใฎๆ–‡ๆ›ธใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3527,12 +3531,12 @@ msgstr ""
 "ใฏ &apt-cdrom; ใฎๆ–‡ๆ›ธใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr "Acquire ใ‚ฐใƒซใƒผใƒ—"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3543,7 +3547,7 @@ msgstr ""
 "(&sources-list; ใ‚‚ๅ‚็…ง)ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3563,7 +3567,7 @@ msgstr ""
 "ไธ‹ใฎ <literal>Max-ValidTime</literal> ใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’ไฝฟ็”จใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3581,7 +3585,7 @@ msgstr ""
 "ๅ›บๆœ‰ใฎ่จญๅฎšใ‚’ไฝœๆˆใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3599,7 +3603,7 @@ msgstr ""
 "ๅฎšใ‚’ไฝœๆˆใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3610,7 +3614,7 @@ msgstr ""
 "ใ™ใ€‚ใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใงใฏ True ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3626,7 +3630,7 @@ msgstr ""
 "ใ‚‚ใ€ใƒ‘ใƒƒใƒใ‚’ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ™ใ‚‹ไปฃใ‚ใ‚Šใซใ€ๅฎŒๅ…จใชใƒ•ใ‚กใ‚คใƒซใ‚’ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3640,7 +3644,7 @@ msgstr ""
 "<literal>access</literal> ใฏใ€URI ใ‚ฟใ‚คใƒ—ใ”ใจใซ 1 ๆŽฅ็ถšใ‚’้–‹ใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3649,7 +3653,7 @@ msgstr ""
 "ใˆใ‚‰ใ‚ŒใŸๅ›žๆ•ฐใ ใ‘ใƒชใƒˆใƒฉใ‚คใ‚’่กŒใ„ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3659,7 +3663,7 @@ msgstr ""
 "ใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3677,7 +3681,7 @@ msgstr ""
 "ใชใ„ใจใ€็’ฐๅขƒๅค‰ๆ•ฐ <envar>http_proxy</envar> ใ‚’ไฝฟ็”จใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3696,7 +3700,7 @@ msgstr ""
 "ใŒๆฑšใ‚Œใ‚‹ใฎใ‚’้˜ฒใ’ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3706,7 +3710,7 @@ msgstr ""
 "ใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3724,7 +3728,7 @@ msgstr ""
 "ใƒ•ใ‚ฉใƒซใƒˆๅ€คใฏ 0 (= ็„กๅŠน) ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3733,7 +3737,7 @@ msgstr ""
 "ใ‹ใฉใ†ใ‹ใ‚’ๅˆถๅพกใ—ใพใ™ใ€‚ใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใงใฏๆœ‰ๅŠนใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3747,7 +3751,7 @@ msgstr ""
 "ใƒญใƒผใƒ‰ใ—ใชใใชใ‚‹ใ“ใจใซๆณจๆ„ใ—ใฆใใ ใ•ใ„)ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3758,7 +3762,7 @@ msgstr ""
 "ใƒญใƒผใƒ‰ใ™ใ‚‹ใŸใ‚ใฎใ€็•ฐใชใ‚‹ User-Agent ใ‚’่จญๅฎšใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3775,7 +3779,7 @@ msgstr ""
 "ใ—ใฆใ„ใพใ›ใ‚“ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3813,7 +3817,7 @@ msgstr ""
 "ใ”ใจใฎใ‚ชใƒ—ใ‚ทใƒงใƒณใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3839,13 +3843,13 @@ msgstr ""
 "ใ‚‹ใซใฏใ€่จญๅฎšใƒ•ใ‚กใ‚คใƒซใซ <literal>ftp::ProxyLogin</literal> ใ‚นใ‚ฏใƒชใƒ—ใƒˆใ‚’่จญๅฎšใ™"
 "ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚ใ“ใฎใ‚จใƒณใƒˆใƒชใซใฏใ€ๆŽฅ็ถšใ™ใ‚‹้š›ใซใƒ—ใƒญใ‚ญใ‚ทใ‚ตใƒผใƒใซ้€ไฟกใ™ใ‚‹ใ‚ณใƒž"
 "ใƒณใƒ‰ใ‚’่จญๅฎšใ—ใพใ™ใ€‚ใฉใฎใ‚ˆใ†ใซใ™ใ‚‹ใฎใ‹ใฏ &configureindex; ใฎไพ‹ใ‚’ๅ‚็…งใ—ใฆใใ ใ•"
-"ใ„ใ€‚URI ใ‚’ๆง‹ๆˆใ™ใ‚‹ใ‚ณใƒณใƒใƒผใƒใƒณใƒˆใซๅฏพๅฟœใ™ใ‚‹็ฝฎๆ›ๅค‰ๆ•ฐใฏใ€<literal>$(PROXY_USER)"
-"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</"
-"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, "
-"<literal>$(SITE_PORT)</literal> ใงใ™ใ€‚"
+"ใ„ใ€‚URI ใ‚’ๆง‹ๆˆใ™ใ‚‹ใ‚ณใƒณใƒใƒผใƒใƒณใƒˆใซๅฏพๅฟœใ™ใ‚‹็ฝฎๆ›ๅค‰ๆ•ฐใฏใ€<literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal>, <literal>$(SITE_PORT)</literal> ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3860,7 +3864,7 @@ msgstr ""
 "ๅฎšไพ‹ใฏใ‚ตใƒณใƒ—ใƒซ่จญๅฎšใƒ•ใ‚กใ‚คใƒซใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„)ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3873,7 +3877,7 @@ msgstr ""
 "FTP over HTTP ใ‚’ไฝฟ็”จใ™ใ‚‹ใฎใฏๆŽจๅฅจใ—ใพใ›ใ‚“ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3889,13 +3893,13 @@ msgstr ""
 "ใ„ใ“ใจใซๆณจๆ„ใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3916,7 +3920,7 @@ msgstr ""
 "ใƒžใƒณใƒ‰ใฏ UMount ใงๆŒ‡ๅฎšใ™ใ‚‹ใ“ใจใŒใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -3925,13 +3929,13 @@ msgstr ""
 "ใ‚‹ใ€<literal>gpgv::Options</literal> ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3949,19 +3953,19 @@ msgstr ""
 "ใ™ใ€‚ๆง‹ๆ–‡ใฏไปฅไธ‹ใฎใ‚ˆใ†ใซใชใ‚Šใพใ™ใ€‚<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -3990,13 +3994,13 @@ msgstr ""
 "<literal>bz2</literal> ใฏ่‡ชๅ‹•็š„ใซ่ฟฝๅŠ ใ•ใ‚Œใ‚‹ใŸใ‚ใ€ๆ˜Ž็คบใ™ใ‚‹ๅฟ…่ฆใฏใ‚ใ‚Šใพใ›ใ‚“ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4020,7 +4024,7 @@ msgstr ""
 "ใฎใฟๅฎš็พฉใ•ใ‚Œใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4031,7 +4035,7 @@ msgstr ""
 "ใ‚“ใฉใƒญใƒผใ‚ซใƒซใƒŸใƒฉใƒผใงใฎใฟๆœ‰ๅŠนใซใชใ‚‹ใ“ใจใซๆณจๆ„ใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4044,7 +4048,7 @@ msgstr ""
 "ใ™ใ‚‹้š›ใซใ€CPU ใฎ่ƒฝๅŠ›ใ‚’ไฝ™่จˆใซๆถˆ่ฒปใ—ใพใ™ใ€‚ใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใงใฏ false ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4062,13 +4066,13 @@ msgstr ""
 "ๆ„ใ—ใฆใใ ใ•ใ„ใ€‚้•ทใ„่จ€่ชžใ‚ณใƒผใƒ‰ใฏ็‰นใซ่ฆ‹ใ‹ใ‘ใพใ›ใ‚“ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4105,7 +4109,7 @@ msgstr ""
 "ใ“ใจใซๆณจๆ„ใ—ใฆใใ ใ•ใ„ใ€‚<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4118,22 +4122,22 @@ msgstr ""
 "ๅพŒ) ใซ่ฟฝๅŠ ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4152,7 +4156,7 @@ msgstr ""
 "ใ‚ตใƒ–ใ‚ขใ‚คใƒ†ใƒ ใ™ในใฆใซใ€ๅ‰ใซไป˜ๅŠ ใ™ใ‚‹ใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒชใ‚’ๅซใ‚“ใงใ„ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4173,7 +4177,7 @@ msgstr ""
 "ๆง˜ใ€<literal>Dir::Cache</literal> ใฏใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒชใ‚’ๅซใ‚“ใงใ„ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4187,7 +4191,7 @@ msgstr ""
 "ใƒ•ใ‚กใ‚คใƒซใ‚’ๆŒ‡ๅฎšใ•ใ‚ŒใŸๅ ดๅˆใฎใฟใ€ใ“ใฎ่จญๅฎšใฎๅŠนๆžœใŒใ‚ใ‚Šใพใ™)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4198,7 +4202,7 @@ msgstr ""
 "ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4215,7 +4219,7 @@ msgstr ""
 "ใƒ—ใƒญใ‚ฐใƒฉใƒ ใฎๅ ดๆ‰€ใ‚’ๆŒ‡ๅฎšใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4235,7 +4239,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> ใ‹ใ‚‰ๆŽขใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4251,12 +4255,12 @@ msgstr ""
 "ใƒ•ใ‚ฉใƒซใƒˆๅ€คใ‚’่ฆ‹ใ‚Œใฐใ‚ใ‹ใ‚‹้€šใ‚Šใ€ใ“ใฎใƒ‘ใ‚ฟใƒผใƒณใซใฏๆญฃ่ฆ่กจ็พใ‚’ไฝฟ็”จใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr "DSelect ใงใฎ APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4267,7 +4271,7 @@ msgstr ""
 "ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4288,7 +4292,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ™ใ‚‹็›ดๅ‰ใซ่กŒใ„ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4297,7 +4301,7 @@ msgstr ""
 "ใ•ใ‚Œใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4306,7 +4310,7 @@ msgstr ""
 "ใ•ใ‚Œใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4315,12 +4319,12 @@ msgstr ""
 "ใ—ใพใ™ใ€‚ใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใฏใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใŸๅ ดๅˆใฎใฟใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr "APT ใŒ &dpkg; ใ‚’ๅ‘ผใถๆ–นๆณ•"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4329,7 +4333,7 @@ msgstr ""
 "<literal>DPkg</literal> ใ‚ปใ‚ฏใ‚ทใƒงใƒณใซใ‚ใ‚Šใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4339,7 +4343,7 @@ msgstr ""
 "ใชใ‘ใ‚Œใฐใชใ‚Šใพใ›ใ‚“ใ€‚ใพใŸใ€ๅ„ใƒชใ‚นใƒˆใฏๅ˜ไธ€ใฎๅผ•ๆ•ฐใจใ—ใฆ &dpkg; ใซๆธกใ•ใ‚Œใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4351,7 +4355,7 @@ msgstr ""
 "bin/sh</filename> ใ‚’้€šใ—ใฆๅ‘ผใณๅ‡บใ•ใ‚Œใ€ไฝ•ใ‹ๅ•้กŒใŒใ‚ใ‚Œใฐ APT ใŒ็•ฐๅธธ็ต‚ไบ†ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4366,7 +4370,7 @@ msgstr ""
 "ใƒžใƒณใƒ‰ใฎๆจ™ๆบ–ๅ…ฅๅŠ›ใซ้€ใ‚Šใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4381,7 +4385,7 @@ msgstr ""
 "Install-Pkgs</literal> ใงไธŽใˆใ‚‰ใ‚Œใ‚‹ใ‚ณใƒžใƒณใƒ‰ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4390,7 +4394,7 @@ msgstr ""
 "<filename>/</filename> ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4399,12 +4403,12 @@ msgstr ""
 "ใพใ™ใ€‚ใƒ‡ใƒ•ใ‚ฉใƒซใƒˆใงใฏ็ฝฒๅใ‚’็„กๅŠนใซใ—ใ€ๅ…จใƒใ‚คใƒŠใƒชใ‚’็”Ÿๆˆใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg ใƒˆใƒชใ‚ฌใฎไฝฟใ„ๆ–น (ใŠใ‚ˆใณ้–ข้€ฃใ‚ชใƒ—ใ‚ทใƒงใƒณ)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4428,7 +4432,7 @@ msgstr ""
 "(ใ‚‚ใ—ใใฏใใ‚ŒไปฅไธŠ) ใฎๆ™‚้–“ 100% ใฎใพใพใจใชใ‚Šใ€้€ฒๆ—ใƒฌใƒใƒผใƒˆใ‚’ๅฃŠใ—ใฆใ—ใพใ„ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4442,7 +4446,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4465,7 +4469,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4485,7 +4489,7 @@ msgstr ""
 "ๅœจ APT ใฏใ€ใ“ใฎใƒ•ใƒฉใ‚ฐใ‚’ใ€ๅฑ•้–‹ๅ‘ผใณๅ‡บใ—ใ‚„ๅ‰Š้™คๅ‘ผใณๅ‡บใ—ใซใ‚‚่ฟฝๅŠ ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4512,7 +4516,7 @@ msgstr ""
 "่ƒฝๆ€งใŒใ‚ใ‚‹ใ‹ใ‚‰ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4529,7 +4533,7 @@ msgstr ""
 "ใงใฏใ€ๆœ€ๅพŒไปฅๅค–ใฎใ™ในใฆใฎๅฎŸ่กŒใงใ€็„กๅŠนใซใงใใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4544,7 +4548,7 @@ msgstr ""
 "ใ“ใจใซๆณจๆ„ใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4562,7 +4566,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4585,12 +4589,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr "Periodic ใ‚ชใƒ—ใ‚ทใƒงใƒณใจ Archives ใ‚ชใƒ—ใ‚ทใƒงใƒณ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4603,12 +4607,12 @@ msgstr ""
 "ใƒˆใฏใ€ใ“ใฎใ‚นใ‚ฏใƒชใƒ—ใƒˆใฎๅ…ˆ้ ญใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr "ใƒ‡ใƒใƒƒใ‚ฐใ‚ชใƒ—ใ‚ทใƒงใƒณ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4624,7 +4628,7 @@ msgstr ""
 "ใฎใ‚ชใƒ—ใ‚ทใƒงใƒณใฏ่ˆˆๅ‘ณใŒใชใ„ใงใ—ใ‚‡ใ†ใŒใ€ไปฅไธ‹ใฎใ‚‚ใฎใฏ่ˆˆๅ‘ณใ‚’ๅผ•ใใ‹ใ‚‚ใ—ใ‚Œใพใ›ใ‚“ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4635,7 +4639,7 @@ msgstr ""
 "ใซใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4646,7 +4650,7 @@ msgstr ""
 "literal>) ใ‚’่กŒใ†ๅ ดๅˆใซไฝฟ็”จใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4658,7 +4662,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4667,34 +4671,34 @@ msgstr ""
 "ใชใ„ใ‚ˆใ†ใซใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr "ไปฅไธ‹ใฏ apt ใซๅฏพใ™ใ‚‹ใƒ‡ใƒใƒƒใ‚ฐใ‚ชใƒ—ใ‚ทใƒงใƒณใฎใ™ในใฆใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ใ‚ฝใƒผใ‚นใธใฎใ‚ขใ‚ฏใ‚ปใ‚นใซ้–ขใ™ใ‚‹ๆƒ…ๅ ฑใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP ใ‚’็”จใ„ใŸใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฎใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใซ้–ขใ™ใ‚‹ๆƒ…ๅ ฑใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP ใ‚’็”จใ„ใŸใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฎใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใซ้–ขใ™ใ‚‹ๆƒ…ๅ ฑใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS ใ‚’็”จใ„ใŸใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฎใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใซ้–ขใ™ใ‚‹ๆƒ…ๅ ฑใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4702,7 +4706,7 @@ msgstr ""
 "<literal>gpg</literal> ใ‚’็”จใ„ใŸๆš—ๅท็ฝฒๅใฎๆคœ่จผใซ้–ขใ™ใ‚‹ๆƒ…ๅ ฑใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4711,12 +4715,12 @@ msgstr ""
 "ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; ใงใฎๆง‹็ฏ‰ไพๅญ˜้–ขไฟ‚่งฃๆฑบใฎใƒ—ใƒญใ‚ปใ‚นใ‚’่ชฌๆ˜Žใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4724,7 +4728,7 @@ msgstr ""
 "<literal>apt</literal> ใƒฉใ‚คใƒ–ใƒฉใƒชใŒ็”Ÿๆˆใ—ใŸใ€ๆš—ๅทๅŒ–ใƒใƒƒใ‚ทใƒฅใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4734,7 +4738,7 @@ msgstr ""
 "ใ‚ทใ‚นใƒ†ใƒ ใซใ‚ใ‚‹ไฝฟ็”จๆธˆใƒปๆœชไฝฟ็”จใƒ–ใƒญใƒƒใ‚ฏใฎๆ•ฐใ‹ใ‚‰ใฎๆƒ…ๅ ฑใ‚’ๅซใ‚ใชใ„ใ‚ˆใ†ใซใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4743,13 +4747,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> ใ‚’ๅฎŸ่กŒใงใใ‚‹ใ‚ˆใ†ใซใชใ‚Šใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "ใ‚ฐใƒญใƒผใƒใƒซใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ‚ญใƒฅใƒผใซๅฏพใ™ใ‚‹้ …็›ฎใฎ่ฟฝๅŠ ใƒปๅ‰Š้™คใฎ้š›ใซใƒญใ‚ฐใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4758,7 +4762,7 @@ msgstr ""
 "ใ‚ธใ‚„ใ‚จใƒฉใƒผใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4767,7 +4771,7 @@ msgstr ""
 "ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -4776,14 +4780,14 @@ msgstr ""
 "ใƒชใ‚นใƒˆใธใฎใƒ‘ใƒƒใƒ้ฉ็”จใซ้–ขใ™ใ‚‹ๆƒ…ๅ ฑใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "ๅฎŸ้š›ใฎใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ‚’่กŒใ†้š›ใฎใ€ใ‚ตใƒ–ใƒ—ใƒญใ‚ปใ‚นใจใฎใ‚„ใ‚Šใจใ‚Šใ‚’ใƒญใ‚ฐใซๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -4792,7 +4796,7 @@ msgstr ""
 "ใซๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4807,7 +4811,7 @@ msgstr ""
 "่ทฏใซๅฏพๅฟœใ—ใฆใ„ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4836,7 +4840,7 @@ msgstr ""
 "ใพใ™ใ€‚<literal>section</literal> ใฏใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒ็พใ‚Œใ‚‹ใ‚ปใ‚ฏใ‚ทใƒงใƒณๅใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -4845,7 +4849,7 @@ msgstr ""
 "ๅˆ‡ใ‚‰ใ‚Œใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -4854,7 +4858,7 @@ msgstr ""
 "ใ‚’่งฃๆžไธญใซ็™บ็”Ÿใ—ใŸใ‚จใƒฉใƒผใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -4863,18 +4867,18 @@ msgstr ""
 "ใฎใƒˆใƒฌใƒผใ‚นใ‚’็”Ÿๆˆใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; ใ‚’ๅ‘ผใณๅ‡บใ™้š›ใซใ€ๅฎŸ่กŒๆ‰‹้ †ใ‚’่ฟฝ่ทกใ—ใŸ็Šถๆ…‹ใƒกใƒƒใ‚ปใƒผใ‚ธใ‚’ๅ‡บๅŠ›ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr "่ตทๅ‹•ๆ™‚ใฎๅ„ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฎๅ„ชๅ…ˆๅบฆใ‚’่กจ็คบใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -4883,7 +4887,7 @@ msgstr ""
 "ใ—ใŸๅ ดๅˆใซใฎใฟใ€้ฉ็”จใ•ใ‚Œใพใ™)ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4894,7 +4898,7 @@ msgstr ""
 "่ชฌๆ˜Žใ—ใŸใ‚‚ใฎใจๅŒใ˜ใงใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -4903,13 +4907,13 @@ msgstr ""
 "ใ—ใพใ™ใ€‚"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "ใ‚ตใƒณใƒ—ใƒซ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4919,7 +4923,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6376,13 +6380,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> ใฏใ€<literal>$(ARCH)</literal> ๅค‰ๆ•ฐใ‚’ๅซใ‚€ๅ ดๅˆ"
 "ใŒใ‚ใ‚Šใพใ™ใ€‚<literal>$(ARCH)</literal> ๅค‰ๆ•ฐใฏใ€ใ‚ทใ‚นใƒ†ใƒ ใงไฝฟ็”จใ—ใฆใ„ใ‚‹ Debian "
@@ -7832,14 +7836,14 @@ msgstr "่ชฌๆ˜Ž"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT ใฏใ‚ฝใƒ•ใƒˆใ‚ฆใ‚งใ‚ขใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฎ็ฎก็†ใ‚ทใ‚นใƒ†ใƒ ใงใ™ใ€‚ๆ—ฅใ€…ใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ็ฎก็†ใฎใŸใ‚"
-"ใซใ€ใ‚ณใƒžใƒณใƒ‰ใƒฉใ‚คใƒณ็”จใฎ B<aptitude>(8) ใ‚„ใ€X Window System ็”จใฎ B<synaptic>"
-"(8) ใจใ„ใฃใŸใ€ใ„ใใคใ‹ใฎใƒ•ใƒญใƒณใƒˆใ‚จใƒณใƒ‰ใŒ็”จๆ„ใ•ใ‚Œใฆใ„ใพใ™ใ€‚ใ„ใใคใ‹ใฎใ‚ชใƒ—ใ‚ทใƒง"
-"ใƒณใฏ B<apt-get>(8) ใซใ—ใ‹ๅฎŸ่ฃ…ใ•ใ‚Œใฆใ„ใพใ›ใ‚“ใ€‚"
+"ใซใ€ใ‚ณใƒžใƒณใƒ‰ใƒฉใ‚คใƒณ็”จใฎ B<aptitude>(8) ใ‚„ใ€X Window System ็”จใฎ "
+"B<synaptic>(8) ใจใ„ใฃใŸใ€ใ„ใใคใ‹ใฎใƒ•ใƒญใƒณใƒˆใ‚จใƒณใƒ‰ใŒ็”จๆ„ใ•ใ‚Œใฆใ„ใพใ™ใ€‚ใ„ใใคใ‹"
+"ใฎใ‚ชใƒ—ใ‚ทใƒงใƒณใฏ B<apt-get>(8) ใซใ—ใ‹ๅฎŸ่ฃ…ใ•ใ‚Œใฆใ„ใพใ›ใ‚“ใ€‚"
 
 #. type: SH
 #: apt.8:31
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4388534f8..ee4461f39 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2012-07-28 21:59+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -811,9 +815,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1613,14 +1617,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Pliki"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3362,19 +3366,19 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3384,7 +3388,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3396,7 +3400,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3406,7 +3410,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3418,7 +3422,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3435,19 +3439,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3455,7 +3459,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3468,7 +3472,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3477,14 +3481,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3493,7 +3497,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3508,7 +3512,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3525,7 +3529,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3536,7 +3540,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3549,7 +3553,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3569,38 +3573,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3608,7 +3612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3621,7 +3625,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3633,7 +3637,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3645,7 +3649,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3653,7 +3657,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3664,7 +3668,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3674,21 +3678,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3700,7 +3704,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3712,14 +3716,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3731,14 +3735,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3748,7 +3752,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3756,7 +3760,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3767,7 +3771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3789,7 +3793,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3808,7 +3812,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3818,7 +3822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3827,7 +3831,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3837,13 +3841,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3856,20 +3860,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3881,19 +3885,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -3911,13 +3915,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -3932,7 +3936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -3940,7 +3944,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3949,7 +3953,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -3961,13 +3965,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -3989,7 +3993,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3998,22 +4002,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4025,7 +4029,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4038,7 +4042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4048,7 +4052,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4056,7 +4060,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4067,7 +4071,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4080,7 +4084,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4091,12 +4095,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4104,7 +4108,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4117,40 +4121,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4158,7 +4162,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4167,7 +4171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4177,7 +4181,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4187,26 +4191,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4221,7 +4225,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4235,7 +4239,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4249,7 +4253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4262,7 +4266,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4279,7 +4283,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4290,7 +4294,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4300,7 +4304,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4318,7 +4322,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4332,12 +4336,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4346,13 +4350,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4363,7 +4367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4371,7 +4375,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4379,7 +4383,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4389,7 +4393,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4399,59 +4403,59 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4459,53 +4463,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4515,7 +4519,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4533,46 +4537,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4580,20 +4584,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Przykล‚ady"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4601,7 +4605,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6099,13 +6103,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 "<literal>Dystrybucja</literal> moลผe zawieraฤ‡ takลผe zmiennฤ… <literal>$(ARCH)</"
 "literal>, ktรณra zostanie rozwiniฤ™ta do architektury Debiana (takiej jak "
@@ -7414,9 +7418,9 @@ msgstr "OPIS"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT jest systemem zarzฤ…dzania pakietami oprogramowania. Jest kilka nakล‚adek "
 "przydatnych do codziennego zarzฤ…dzania pakietami, takich jak B<aptitude>(8), "
@@ -7702,8 +7706,8 @@ msgstr ""
 "Pierwszฤ… rzeczฤ… <footnote><p> Aby uลผywaฤ‡ serwera proxy, naleลผy najpierw "
 "ustawiฤ‡ zmiennฤ… ล›rodowiskowฤ… http_proxy, proszฤ™ przeczytaฤ‡ sources.list(5)</"
 "p></footnote>, ktรณrฤ… naleลผy zrobiฤ‡ przed uลผyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietรณw (ze <em>ลบrรณdeล‚</em> wymienionych w pliku sources.list"
-"(5)), tak ลผeby APT wiedziaล‚, jakie pakiety sฤ… dostฤ™pne. Robi siฤ™ to za "
+"pobranie listy pakietรณw (ze <em>ลบrรณdeล‚</em> wymienionych w pliku sources."
+"list(5)), tak ลผeby APT wiedziaล‚, jakie pakiety sฤ… dostฤ™pne. Robi siฤ™ to za "
 "pomocฤ… polecenia <tt>apt-get update</tt>. Na przykล‚ad:"
 
 #. type: <example></example>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 314b5771b..79d90d65b 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2012-09-03 01:53+0100\n"
 "Last-Translator: Amรฉrico Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -809,9 +813,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1566,14 +1570,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 msgid "See Also"
@@ -3275,14 +3279,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
-"Em geral o exemplo de ficheiro de configuraรงรฃo em <filename>&docdir;examples/"
-"apt.conf</filename> &configureindex; รฉ um bom guia de como deve ficar."
+"Em geral o exemplo de ficheiro de configuraรงรฃo &configureindex; รฉ um bom "
+"guia de como deve ficar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3292,7 +3296,7 @@ msgstr ""
 "pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3308,7 +3312,7 @@ msgstr ""
 "opรงรฃo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3328,7 +3332,7 @@ msgstr ""
 "acabar com um 'ponto e vรญrgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3344,7 +3348,7 @@ msgstr ""
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3363,7 +3367,7 @@ msgstr ""
 "ser usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3393,12 +3397,12 @@ msgstr ""
 "explicitamente delas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr "O Grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3407,7 +3411,7 @@ msgstr ""
 "as opรงรตes para todas as ferramentas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3418,7 +3422,7 @@ msgstr ""
 "qual o APT foi compilado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3440,7 +3444,7 @@ msgstr ""
 "<command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3453,7 +3457,7 @@ msgstr ""
 "'&testing-codename;', '4.0', '5.0*'. Veja tambรฉm &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3462,7 +3466,7 @@ msgstr ""
 "os pacotes segurados sejam ignorados na sua decisรฃo de marcaรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3476,7 +3480,7 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3503,7 +3507,7 @@ msgstr ""
 "de A nรฃo estรก mais satisfeita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3532,7 +3536,7 @@ msgstr ""
 "que pode ajudar a prevenir."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3549,7 +3553,7 @@ msgstr ""
 "eles possa trabalhar em melhorar ou corrigir o processo de actualizaรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3570,7 +3574,7 @@ msgstr ""
 "command> ou nada de que esses pacotes dependam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3607,13 +3611,13 @@ msgstr ""
 "da cache รฉ desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define quais pacotes sรฃo considerados dependรชncias essenciais de compilaรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3622,7 +3626,7 @@ msgstr ""
 "documentaรงรฃo para mais informaรงรฃo acerca das opรงรตes daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3631,7 +3635,7 @@ msgstr ""
 "documentaรงรฃo para mais informaรงรฃo acerca das opรงรตes daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3640,12 +3644,12 @@ msgstr ""
 "documentaรงรฃo para mais informaรงรฃo acerca das opรงรตes de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3656,7 +3660,7 @@ msgstr ""
 "descarga (veja tambรฉm &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3678,7 +3682,7 @@ msgstr ""
 "seguinte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3698,7 +3702,7 @@ msgstr ""
 "nome da opรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3718,7 +3722,7 @@ msgstr ""
 "arquivo ao nome da opรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3729,7 +3733,7 @@ msgstr ""
 "por inteiro. Verdadeiro por predefiniรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3747,7 +3751,7 @@ msgstr ""
 "completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3762,7 +3766,7 @@ msgstr ""
 "aberta uma ligaรงรฃo por tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3771,7 +3775,7 @@ msgstr ""
 "tentar, no nรบmero fornecido de vezes, obter ficheiros falhados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -3781,7 +3785,7 @@ msgstr ""
 "A predefiniรงรฃo รฉ verdadeiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3792,15 +3796,15 @@ msgid ""
 "be used."
 msgstr ""
 "<literal>http::Proxy</literal> define o proxy http predefinido a usar para "
-"URIs de HTTP. Estรก no formato standard de <literal>http://[[user][:pass]@]"
-"host[:port]/</literal>. Tambรฉm podem ser especificados proxies por mรกquina "
-"ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a palavra "
-"chave especial <literal>DIRECT</literal> que significa nรฃo usar proxies. Se "
-"nenhuma das definiรงรตes acima for especificada, serรก usada a variรกvel de "
-"ambiente <envar>http_proxy</envar>."
+"URIs de HTTP. Estรก no formato standard de <literal>http://[[user][:"
+"pass]@]host[:port]/</literal>. Tambรฉm podem ser especificados proxies por "
+"mรกquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a "
+"palavra chave especial <literal>DIRECT</literal> que significa nรฃo usar "
+"proxies. Se nenhuma das definiรงรตes acima for especificada, serรก usada a "
+"variรกvel de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3820,7 +3824,7 @@ msgstr ""
 "(grandes) ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3830,7 +3834,7 @@ msgstr ""
 "dados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3849,7 +3853,7 @@ msgstr ""
 "web e proxies que escolheram nรฃo respeitar a especificaรงรฃo HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3858,7 +3862,7 @@ msgstr ""
 "os redireccionamentos, o que estรก activo por predefiniรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3873,7 +3877,7 @@ msgstr ""
 "de mรบltiplos servidores ao mesmo tempo.)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3885,7 +3889,7 @@ msgstr ""
 "identificador conhecido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3902,7 +3906,7 @@ msgstr ""
 "literal> ainda nรฃo รฉ suportada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3941,7 +3945,7 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> รฉ a opรงรฃo 'por mรกquina' correspondente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3970,11 +3974,12 @@ msgstr ""
 "servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
 "exemplo de como fazer isto. As variรกveis de substituiรงรฃo que representam o "
 "componente URI correspondente sรฃo <literal>$(PROXY_USER)</literal> <literal>"
-"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)"
-"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
+"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3990,7 +3995,7 @@ msgstr ""
 "especรญfica (veja a amostra de ficheiro de configuraรงรฃo para exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4004,7 +4009,7 @@ msgstr ""
 "eficiรชncia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4019,13 +4024,13 @@ msgstr ""
 "ligaรงรตes IPv4. Note que a maioria dos servidores FTP nรฃo suporta RFC2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4046,7 +4051,7 @@ msgstr ""
 "barra final. Comandos para desmontar podem ser especificados usando o UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4055,13 +4060,13 @@ msgstr ""
 "literal>, a qual passa parรขmetros adicionais ao gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Extensรฃo de Ficheiro</replaceable> \"<replaceable>Nome de mรฉtodo</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4080,19 +4085,19 @@ msgstr ""
 "alterado. A sintaxe para isto รฉ: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4124,13 +4129,13 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4156,7 +4161,7 @@ msgstr ""
 "prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4168,7 +4173,7 @@ msgstr ""
 "maioritariamente apenas para mirrors locais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4181,7 +4186,7 @@ msgstr ""
 "CPU quando constrรณi as caches de pacotes locais. Falso por predefiniรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4201,13 +4206,13 @@ msgstr ""
 "especialmenteraros."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4246,7 +4251,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4260,22 +4265,22 @@ msgstr ""
 "literal>\" implรญcito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr "Directรณrios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4294,7 +4299,7 @@ msgstr ""
 "items que nรฃo comeรงam com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4316,7 +4321,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4331,7 +4336,7 @@ msgstr ""
 "ficheiro de configuraรงรฃo especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4342,7 +4347,7 @@ msgstr ""
 "estar feito entรฃo รฉ carregado o ficheiro de configuraรงรฃo principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4360,7 +4365,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4381,7 +4386,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4399,12 +4404,12 @@ msgstr ""
 "expressรฃo regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4415,7 +4420,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4437,7 +4442,7 @@ msgstr ""
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4446,7 +4451,7 @@ msgstr ""
 "comandos quando รฉ corrido para a fase de instalaรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4455,7 +4460,7 @@ msgstr ""
 "comandos quando รฉ executado para a fase de actualizaรงรฃo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4464,12 +4469,12 @@ msgstr ""
 "continuar. A predefiniรงรฃo รฉ avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4478,7 +4483,7 @@ msgstr ""
 "&dpkg;. Estas estรฃo na secรงรฃo <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4489,7 +4494,7 @@ msgstr ""
 "um argumento รบnico ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4502,7 +4507,7 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irรก abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4518,7 +4523,7 @@ msgstr ""
 "instalar, um por cada linha na entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4533,7 +4538,7 @@ msgstr ""
 "dado ao <literal>Pre-Install-Pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4542,7 +4547,7 @@ msgstr ""
 "predefiniรงรฃo รฉ <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4551,12 +4556,12 @@ msgstr ""
 "predefiniรงรฃo รฉ desactivar a assinatura e produzir todos os binรกrios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilizaรงรฃo trigger do dpkg (e opรงรตes relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4582,7 +4587,7 @@ msgstr ""
 "100% enquanto na realidade estรก a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4596,7 +4601,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4620,7 +4625,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4642,7 +4647,7 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4672,7 +4677,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4690,7 +4695,7 @@ msgstr ""
 "esta opรงรฃo em todas excepto na รบltima execuรงรฃo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4706,7 +4711,7 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4724,7 +4729,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4748,12 +4753,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr "Opรงรตes Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4766,12 +4771,12 @@ msgstr ""
 "Veja o cabeรงalho deste script para uma breve documentaรงรฃo das suas opรงรตes."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr "Opรงรตes de depuraรงรฃo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4788,7 +4793,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4799,7 +4804,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4810,7 +4815,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador nรฃo root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4822,7 +4827,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4831,12 +4836,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opรงรตes de depuraรงรฃo para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -4844,25 +4849,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Escreve informaรงรฃo relacionada com o descarregamento de pacotes usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informaรงรฃo relacionada com o descarregamento de pacotes usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informaรงรฃo relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -4871,7 +4876,7 @@ msgstr ""
 "criptogrรกficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -4880,13 +4885,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependรชncias de compilaรงรฃo no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -4895,7 +4900,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4906,7 +4911,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4916,14 +4921,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items sรฃo adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -4932,7 +4937,7 @@ msgstr ""
 "checksums e assinaturas criptogrรกficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -4942,7 +4947,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -4951,7 +4956,7 @@ msgstr ""
 "do apt quando se descarrega diffs de รญndice em vez de รญndices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -4959,7 +4964,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -4968,7 +4973,7 @@ msgstr ""
 "de pacotes e com a remoรงรฃo de pacotes nรฃo utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4983,7 +4988,7 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5014,7 +5019,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5024,7 +5029,7 @@ msgstr ""
 "รบnico."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5033,7 +5038,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5042,7 +5047,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5050,12 +5055,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5064,7 +5069,7 @@ msgstr ""
 "acontece quando รฉ encontrado um problema de dependรชncias complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5075,7 +5080,7 @@ msgstr ""
 "mesma que รฉ descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5084,13 +5089,13 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5100,7 +5105,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -6599,13 +6604,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> tambรฉm pode conter uma variรกvel. <literal>"
 "$(ARCH)</literal> a qual se expande ร  arquitectura Debian (tal como "
@@ -8102,9 +8107,9 @@ msgstr "DESCRIร‡รƒO"
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 "APT รฉ um sistema de gestรฃo para pacotes de software. Para a gestรฃo de "
 "pacotes normal do dia-a-dia existem vรกrios frontends disponรญveis, como o "
@@ -8383,11 +8388,11 @@ msgid ""
 "instance,"
 msgstr ""
 "O primeira <footnote><p>se vocรช estรก a usar um servidor proxy http vocรช tem "
-"que definir a variรกvel de ambiente http_proxy primeiro, veja sources.list(5)"
-"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> "
-"รฉ obter as listas de pacotes a partir das <em>Sources</em> para que ele "
-"saiba que pacotes estรฃo disponรญveis. Isto รฉ feito com <tt>apt-get update</"
-"tt>. Por exemplo,"
+"que definir a variรกvel de ambiente http_proxy primeiro, veja sources."
+"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
+"prgn> รฉ obter as listas de pacotes a partir das <em>Sources</em> para que "
+"ele saiba que pacotes estรฃo disponรญveis. Isto รฉ feito com <tt>apt-get "
+"update</tt>. Por exemplo,"
 
 #. type: <example></example>
 #: guide.sgml:116
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index d2f597a6a..a415d9528 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: Andrรฉ Luรญs Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -586,9 +590,9 @@ msgid ""
 "installation or upgrading.  Each package is a package name, not a fully "
 "qualified filename (for instance, in a Debian system, <package>apt-utils</"
 "package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed.  "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
 "desired packages. If a hyphen is appended to the package name (with no "
 "intervening space), the identified package will be removed if it is "
 "installed.  Similarly a plus sign can be used to designate a package to "
@@ -1091,14 +1095,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
 #: apt-ftparchive.1.xml:607
 #, fuzzy
@@ -2340,19 +2344,19 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2362,7 +2366,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2374,7 +2378,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2384,7 +2388,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2396,7 +2400,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2413,19 +2417,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2433,7 +2437,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2446,7 +2450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2455,14 +2459,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -2471,7 +2475,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -2486,7 +2490,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2503,7 +2507,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -2514,7 +2518,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -2527,7 +2531,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -2547,38 +2551,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2586,7 +2590,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2599,7 +2603,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2611,7 +2615,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2623,7 +2627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2631,7 +2635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2642,7 +2646,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2652,21 +2656,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -2678,7 +2682,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2690,14 +2694,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -2709,14 +2713,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -2726,7 +2730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -2734,7 +2738,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2745,7 +2749,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2767,7 +2771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -2786,7 +2790,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -2796,7 +2800,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -2805,7 +2809,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2815,13 +2819,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -2834,20 +2838,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -2859,19 +2863,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -2889,13 +2893,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -2910,7 +2914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -2918,7 +2922,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2927,7 +2931,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -2939,13 +2943,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -2967,7 +2971,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -2976,22 +2980,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3003,7 +3007,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3016,7 +3020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3026,7 +3030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3034,7 +3038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3045,7 +3049,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3058,7 +3062,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3069,12 +3073,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3082,7 +3086,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3095,40 +3099,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3136,7 +3140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3145,7 +3149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3155,7 +3159,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3165,26 +3169,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3199,7 +3203,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3209,7 +3213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -3223,7 +3227,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -3236,7 +3240,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -3253,7 +3257,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3264,7 +3268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3274,7 +3278,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3286,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3300,12 +3304,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3314,12 +3318,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3330,7 +3334,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3338,7 +3342,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3346,7 +3350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3356,66 +3360,66 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:835
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3423,53 +3427,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3479,7 +3483,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -3497,46 +3501,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -3544,21 +3548,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3566,7 +3570,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -4839,8 +4843,8 @@ msgid ""
 "id=\"0\"/>"
 msgstr ""
 "Com um arquivo &sources-list; adequado e o arquivo de preferรชncias do APT "
-"acima, quaisquer dos comandos a seguir farรฃo com que o APT atualize para a"
-"(s) รบltima(s) versรฃo(รตes) <literal>testing</literal>."
+"acima, quaisquer dos comandos a seguir farรฃo com que o APT atualize para "
+"a(s) รบltima(s) versรฃo(รตes) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:633
@@ -5060,13 +5064,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6187,9 +6191,9 @@ msgstr ""
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 
 #. type: SH
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 3f814b9f0..fe8bac6c9 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -55,9 +55,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
 					 vector<string> &NoPubKeySigners)
 {
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
-   // setup a (empty) stringstream for formating the return value
-   std::stringstream ret;
-   ret.str("");
 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;
@@ -170,18 +167,19 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return "";
    }
    else if (WEXITSTATUS(status) == 1)
-   {
       return _("At least one invalid signature was encountered.");
-   }
    else if (WEXITSTATUS(status) == 111)
+      return _("Could not execute 'gpgv' to verify signature (is gpgv installed?)");
+   else if (WEXITSTATUS(status) == 112)
    {
-      ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"));
-      return ret.str();
+      // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)
+      std::string errmsg;
+      //TRANSLATORS: %s is a single techy word like 'NODATA'
+      strprintf(errmsg, _("Clearsigned file isn't valid, got '%s' (does the network require authentication?)"), "NODATA");
+      return errmsg;
    }
    else
-   {
       return _("Unknown error executing gpgv");
-   }
 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)
diff --git a/methods/http.cc b/methods/http.cc
index fddf8a78e..db1085a2d 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -667,7 +667,12 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
 
    // The HTTP server expects a hostname with a trailing :port
    char Buf[1000];
-   string ProperHost = Uri.Host;
+   string ProperHost;
+
+   if (Uri.Host.find(':') != string::npos)
+      ProperHost = '[' + Uri.Host + ']';
+   else
+      ProperHost = Uri.Host;
    if (Uri.Port != 0)
    {
       sprintf(Buf,":%u",Uri.Port);
@@ -975,12 +980,7 @@ HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       {
 	 URI Uri = Queue->Uri;
 	 if (Uri.Host.empty() == false)
-	 {
-	    if (Uri.Port != 0)
-	       strprintf(NextURI, "http://%s:%u", Uri.Host.c_str(), Uri.Port);
-	    else
-	       NextURI = "http://" + Uri.Host;
-	 }
+            NextURI = URI::SiteOnly(Uri);
 	 else
 	    NextURI.clear();
 	 NextURI.append(DeQuoteString(Srv->Location));
diff --git a/methods/https.cc b/methods/https.cc
index 11d4ba8aa..84ce2d68f 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -63,6 +63,12 @@ void HttpsMethod::SetupProxy()  					/*{{{*/
 {
    URI ServerName = Queue->Uri;
 
+   // Curl should never read proxy settings from the environment, as
+   // we determine which proxy to use.  Do this for consistency among
+   // methods and prevent an environment variable overriding a
+   // no-proxy ("DIRECT") setting in apt.conf.
+   curl_easy_setopt(curl, CURLOPT_PROXY, "");
+
    // Determine the proxy setting - try https first, fallback to http and use env at last
    string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
 				   _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
@@ -81,7 +87,14 @@ void HttpsMethod::SetupProxy()  					/*{{{*/
       if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
 	 return;
    } else {
-      const char* result = getenv("http_proxy");
+      const char* result = getenv("https_proxy");
+      // FIXME: Fall back to http_proxy is to remain compatible with
+      // existing setups and behaviour of apt.conf.  This should be
+      // deprecated in the future (including apt.conf).  Most other
+      // programs do not fall back to http proxy settings and neither
+      // should Apt.
+      if (result == NULL)
+         result = getenv("http_proxy");
       UseProxy = result == NULL ? "" : result;
    }
 
@@ -92,6 +105,11 @@ void HttpsMethod::SetupProxy()  					/*{{{*/
       if (Proxy.Port != 1)
 	 curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
       curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
+      if (Proxy.User.empty() == false || Proxy.Password.empty() == false)
+      {
+         curl_easy_setopt(curl, CURLOPT_PROXYUSERNAME, Proxy.User.c_str());
+         curl_easy_setopt(curl, CURLOPT_PROXYPASSWORD, Proxy.Password.c_str());
+      }
    }
 }									/*}}}*/
 // HttpsMethod::Fetch - Fetch an item					/*{{{*/
@@ -285,6 +303,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    long curl_servdate;
    curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate);
 
+   // If the server returns 200 OK but the If-Modified-Since condition is not
+   // met, CURLINFO_CONDITION_UNMET will be set to 1
+   long curl_condition_unmet = 0;
+   curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &curl_condition_unmet);
+
    File->Close();
 
    // cleanup
@@ -312,7 +335,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       Res.Filename = File->Name();
       Res.LastModified = Buf.st_mtime;
       Res.IMSHit = false;
-      if (curl_responsecode == 304)
+      if (curl_responsecode == 304 || curl_condition_unmet)
       {
 	 unlink(File->Name().c_str());
 	 Res.IMSHit = true;
diff --git a/methods/makefile b/methods/makefile
index a271aff5e..294c55d23 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -39,7 +39,7 @@ include $(PROGRAM_H)
 
 # The cdrom method
 PROGRAM=cdrom
-SLIBS = -lapt-pkg -ldl $(INTLLIBS)
+SLIBS = -lapt-pkg $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
diff --git a/methods/mirror.cc b/methods/mirror.cc
index d6c5ba955..854366318 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -311,6 +311,9 @@ bool MirrorMethod::InitMirrors()
 
       AllMirrors.push_back(s);
    }
+   if (AllMirrors.empty()) {
+	return _error->Error(_("No entry found in mirror file '%s'"), MirrorFile.c_str());
+   }
    Mirror = AllMirrors[0];
    UsedMirror = Mirror;
    return true;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index f0c430fef..518844781 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,15 @@
 #, fuzzy
 msgid ""
 msgstr ""
+<<<<<<< HEAD
 "Project-Id-Version: apt 0.9.7.7ubuntu3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2013-04-11 14:52+0200\n"
+=======
+"Project-Id-Version: apt 0.9.8.1\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
+>>>>>>> upstream/debian/sid
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,72 +100,77 @@ msgstr ""
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr ""
 
+<<<<<<< HEAD
 #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+=======
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
+>>>>>>> upstream/debian/sid
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -196,20 +207,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -425,7 +444,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
@@ -532,8 +551,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
@@ -569,7 +588,11 @@ msgstr ""
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
+<<<<<<< HEAD
 #: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+=======
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
@@ -578,7 +601,7 @@ msgstr ""
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -654,7 +677,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
@@ -699,7 +722,7 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -707,85 +730,89 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr ""
 
+<<<<<<< HEAD
 #: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+=======
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
+>>>>>>> upstream/debian/sid
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -793,141 +820,149 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
+<<<<<<< HEAD
 #: cmdline/apt-get.cc:3371
 msgid "Supported modules:"
 msgstr ""
 
 #: cmdline/apt-get.cc:3412
+=======
+#: cmdline/apt-get.cc:3366
+msgid "Supported modules:"
+msgstr ""
+
+#: cmdline/apt-get.cc:3407
+>>>>>>> upstream/debian/sid
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -973,7 +1008,11 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: cmdline/apt-get.cc:3577
+=======
+#: cmdline/apt-get.cc:3572
+>>>>>>> upstream/debian/sid
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1041,7 +1080,12 @@ msgid "%s was already not hold.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+=======
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -1175,8 +1219,13 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
+<<<<<<< HEAD
 #: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
 #: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+=======
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
+>>>>>>> upstream/debian/sid
 msgid "Read error"
 msgstr ""
 
@@ -1189,8 +1238,13 @@ msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
 #: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+=======
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
+>>>>>>> upstream/debian/sid
 msgid "Write error"
 msgstr ""
 
@@ -1328,11 +1382,16 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 
+<<<<<<< HEAD
 #: methods/gpgv.cc:180
+=======
+#: methods/gpgv.cc:166
+>>>>>>> upstream/debian/sid
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
+<<<<<<< HEAD
 #: methods/gpgv.cc:185
 msgid "At least one invalid signature was encountered."
 msgstr ""
@@ -1350,6 +1409,33 @@ msgid "The following signatures were invalid:\n"
 msgstr ""
 
 #: methods/gpgv.cc:242
+=======
+#: methods/gpgv.cc:170
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr ""
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
+msgid "The following signatures were invalid:\n"
+msgstr ""
+
+#: methods/gpgv.cc:229
+>>>>>>> upstream/debian/sid
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1387,6 +1473,7 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
+<<<<<<< HEAD
 #: methods/http.cc:818
 msgid "Select failed"
 msgstr ""
@@ -1412,6 +1499,33 @@ msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 #: methods/http.cc:921
+=======
+#: methods/http.cc:827
+msgid "Select failed"
+msgstr ""
+
+#: methods/http.cc:832
+msgid "Connection timed out"
+msgstr ""
+
+#: methods/http.cc:855
+msgid "Error writing to output file"
+msgstr ""
+
+#: methods/http.cc:886
+msgid "Error writing to file"
+msgstr ""
+
+#: methods/http.cc:914
+msgid "Error writing to the file"
+msgstr ""
+
+#: methods/http.cc:928
+msgid "Error reading from server. Remote end closed connection"
+msgstr ""
+
+#: methods/http.cc:930
+>>>>>>> upstream/debian/sid
 msgid "Error reading from server"
 msgstr ""
 
@@ -1429,11 +1543,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
+<<<<<<< HEAD
 #: methods/mirror.cc:95 apt-inst/extract.cc:465
 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
 #: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+=======
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1460,7 +1582,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr ""
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr ""
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1540,7 +1667,11 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+=======
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
@@ -1850,23 +1981,23 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
@@ -2083,7 +2214,11 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/strutl.cc:1167
+=======
+#: apt-pkg/contrib/strutl.cc:1173
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -2213,77 +2348,94 @@ msgstr ""
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:846
+=======
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:848
+=======
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+=======
+#: apt-pkg/contrib/fileutl.cc:985
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1066
+=======
+#: apt-pkg/contrib/fileutl.cc:1062
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
 msgstr ""
@@ -2293,31 +2445,62 @@ msgid "Failed to exec compressor "
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:1309
+=======
+#: apt-pkg/contrib/fileutl.cc:1147
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1202
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1297
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+=======
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1736
+=======
+#: apt-pkg/contrib/fileutl.cc:1681
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Problem closing the file %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1748
+=======
+#: apt-pkg/contrib/fileutl.cc:1693
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1759
+=======
+#: apt-pkg/contrib/fileutl.cc:1704
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/contrib/fileutl.cc:1774
+=======
+#: apt-pkg/contrib/fileutl.cc:1717
+>>>>>>> upstream/debian/sid
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2508,19 +2691,19 @@ msgstr ""
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2539,23 +2722,35 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/algorithms.cc:1228
+=======
+#: apt-pkg/algorithms.cc:1234
+>>>>>>> upstream/debian/sid
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/algorithms.cc:1230
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 #: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+=======
+#: apt-pkg/algorithms.cc:1236
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
+>>>>>>> upstream/debian/sid
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
@@ -2592,7 +2787,7 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2655,6 +2850,7 @@ msgstr ""
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
+<<<<<<< HEAD
 #: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
 #: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
 #: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
@@ -2663,6 +2859,16 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
 #: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
 #: apt-pkg/pkgcachegen.cc:570
+=======
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
@@ -2683,16 +2889,25 @@ msgstr ""
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/pkgcachegen.cc:577
+=======
+#: apt-pkg/pkgcachegen.cc:570
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/pkgcachegen.cc:1150
+=======
+#: apt-pkg/pkgcachegen.cc:1199
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
 #: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
 msgid "Reading package lists"
@@ -2703,6 +2918,18 @@ msgid "Collecting File Provides"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+=======
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1304
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+>>>>>>> upstream/debian/sid
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2715,40 +2942,69 @@ msgstr ""
 msgid "MD5Sum mismatch"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
 msgid "Hash Sum mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1381
+=======
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1377
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1397
+=======
+#: apt-pkg/acquire-item.cc:1393
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1477
+=======
+#: apt-pkg/acquire-item.cc:1435
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1473
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1499
+=======
+#: apt-pkg/acquire-item.cc:1495
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1532
+=======
+#: apt-pkg/acquire-item.cc:1525
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -2756,32 +3012,52 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+=======
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1646
+=======
+#: apt-pkg/acquire-item.cc:1652
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1705
+=======
+#: apt-pkg/acquire-item.cc:1711
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1764
+=======
+#: apt-pkg/acquire-item.cc:1770
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/acquire-item.cc:1862
+=======
+#: apt-pkg/acquire-item.cc:1868
+>>>>>>> upstream/debian/sid
 msgid "Size mismatch"
 msgstr ""
 
@@ -2831,7 +3107,7 @@ msgstr ""
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
@@ -2889,30 +3165,46 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+=======
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+=======
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+=======
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+=======
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
+>>>>>>> upstream/debian/sid
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 02c37bc81..f77c14a2b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -100,73 +100,73 @@ msgstr "ู…ุฌู…ูˆุน ุงู„ู…ุณุงุญุฉ ุงู„ู…ุญุณูˆุจ ุญุณุงุจู‡ุง:"
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ู„ู… ูŠูุนุซุฑ ุนู„ู‰ ุฃูŠุฉ ุญุฒู…"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "ูŠุฌุจ ุฃู† ุชุนุทูŠ ุตูŠุบุฉ ูˆุงุญุฏุฉ ุจุงู„ุถุจุท"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ุชุนุฐุฑ ุงู„ุนุซูˆุฑ ุนู„ู‰ ุงู„ุญุฒู…ุฉ %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ู…ู„ูุงุช ุงู„ุญุฒู…:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ุงู„ุญุฒู… ุงู„ู…ูุฏุจู‘ุณุฉ:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ุบูŠุฑ ู…ูˆุฌูˆุฏ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr " ู…ูุซุจู‘ุช:"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ู…ุฑุดู‘ุญ: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ู„ุงุดูŠุก)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr " ุฌุฏูˆู„ ุงู„ู†ุณุฎ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ู„ู€%s %s ู…ูุฌู…ู‘ุน ุนู„ู‰ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,21 +203,29 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "ุงู„ุฑุฌุงุก ูƒุชุงุจุฉ ุงุณู… ู„ู‡ุฐุง ุงู„ู‚ุฑุตุŒ ู…ุซุงู„ 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ุงู„ุฑุฌุงุก ุฅุฏุฎุงู„ ู‚ุฑุต ููŠ ุงู„ุณูˆุงู‚ุฉ ูˆุถุบุท ุงู„ุฒุฑ enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ูุดู„ ุชุบูŠูŠุฑ ุงุณู… %s ุฅู„ู‰ %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ูƒุฑุฑ ู‡ุฐู‡ ุงู„ุนู…ู„ูŠุฉ ู„ุจุงู‚ูŠ ุงู„ุฃู‚ุฑุงุต ุงู„ู…ุฏู…ุฌุฉ ููŠ ุงู„ู…ุฌู…ูˆุนุฉ."
 
@@ -435,7 +443,7 @@ msgstr "ุฅุนุงุฏุฉ ุชุซุจูŠุช  %s ุบูŠุฑ ู…ู…ูƒู†ุฉุŒ ุญูŠุซ ุฃู†ู‘ู‡ ู„ุง ูŠู…ู
 msgid "%s is already the newest version.\n"
 msgstr "%s ู‡ูŠ ุงู„ู†ุณุฎุฉ ุงู„ุฃุญุฏุซ.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ุฅู„ุง ุฃู†ู‡ ุณูŠุชู… ุชุซุจูŠุช %s"
@@ -542,8 +550,8 @@ msgstr "ุจุนุฏ ุงู„ุงุณุชุฎุฑุงุฌ %sุจ ู…ู† ุงู„ู…ุณุงุญุฉ ุงู„ุฅุถุงููŠู‘ุฉ ุณ
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ุจุนุฏ ุงู„ุงุณุชุฎุฑุงุฌ %sุจ ู…ู† ุงู„ู…ุณุงุญุฉ ุณุชูุฑู‘ุบ.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ุชุนุฐุฑ ุญุณุงุจ ุงู„ู…ุณุงุญุฉ ุงู„ุญุฑุฉ ููŠ %s"
@@ -582,7 +590,7 @@ msgstr "ุฅุฌู‡ุงุถ."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ู‡ู„ ุชุฑูŠุฏ ุงู„ุงุณุชู…ุฑุงุฑ [Y/n]ุŸ"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ูุดู„ ุฅุญุถุงุฑ %s  %s\n"
@@ -591,7 +599,7 @@ msgstr "ูุดู„ ุฅุญุถุงุฑ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "ูุดู„ ุชู†ุฒูŠู„ ุจุนุถ ุงู„ู…ู„ูุงุช"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ุงูƒุชู…ู„ ุงู„ุชู†ุฒูŠู„ ูˆููŠ ูˆุถุน ุงู„ุชู†ุฒูŠู„ ูู‚ุท"
 
@@ -669,7 +677,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ู‚ุฏ ุชุณุงุนุฏ ุงู„ู…ุนู„ูˆู…ุงุช ุงู„ุชุงู„ูŠุฉ ููŠ ุญู„ ุงู„ู…ุดูƒู„ุฉ:"
 
@@ -717,7 +725,7 @@ msgid ""
 msgstr ""
 "ู…ูุนุชู…ุฏุงุช ุบูŠุฑ ู…ุณุชูˆูุงุฉ. ุฌุฑุจ 'apt-get -f install' ุจุฏูˆู† ุฃุณู…ุงุก ุญุฒู… (ุฃูˆ ุญุฏู‘ุฏ ุญู„ุงู‹)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -725,85 +733,85 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ุญุฒู… ู…ุนุทูˆุจุฉ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ุณูŠุชู… ุชุซุจูŠุช ุงู„ุญุฒู… ุงู„ุฅุถุงููŠู‘ุฉ ุงู„ุชุงู„ูŠุฉ:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ุงู„ุญุฒู… ุงู„ู…ู‚ุชุฑุญุฉ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ุงู„ุญุฒู… ุงู„ู…ุณุชุญุณู†ุฉ:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ุชุนุฐุฑ ุงู„ุนุซูˆุฑ ุนู„ู‰ ุงู„ุญุฒู…ุฉ %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ุฅู„ุง ุฃู†ู‡ ุณูŠุชู… ุชุซุจูŠุช %s"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ุญุณุงุจ ุงู„ุชุฑู‚ูŠุฉ..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ูุดู„"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ุชู…ู‘"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ุชุนุฐุฑ ู‚ูŽูู’ู„ ุฏู„ูŠู„ ุงู„ุชู†ุฒูŠู„"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "ูŠุฌุจ ุชุญุฏูŠุฏ ุญุฒู…ุฉ ูˆุงุญุฏุฉ ุนู„ู‰ ุงู„ุฃู‚ู„ ู„ุฌู„ุจ ู…ุตุฏุฑู‡ุง"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ุชุนุฐุฑ ุงู„ุนุซูˆุฑ ุนู„ู‰ ู…ุตุฏุฑ ุงู„ุญุฒู…ุฉ %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -811,141 +819,141 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ุชุฎุทูŠ ุงู„ู…ู„ู '%s' ุงู„ู…ู†ุฒู„ ู…ุณุจู‚ุงู‹\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ู„ูŠุณ ู‡ู†ุงูƒ ู…ุณุงุญุฉ ูƒุงููŠุฉ ููŠ %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ูŠุฌุจ ุฌู„ุจ %sุจ/%sุจ ู…ู† ุงู„ุฃุฑุดูŠูุงุช ุงู„ู…ุตุฏุฑูŠุฉ.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ูŠุฌุจ ุฌู„ุจ %sุจ ู…ู† ุงู„ุฃุฑุดูŠูุงุช ุงู„ู…ุตุฏุฑูŠู‘ุฉ.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ุฅุญุถุงุฑ ุงู„ู…ุตุฏุฑ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ูุดู„ ุฅุญุถุงุฑ ุจุนุถ ุงู„ุฃุฑุดูŠูุงุช."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ุฃู…ุฑ ููƒ ุงู„ุญุฒู…ุฉ '%s' ูุดู„.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ุฃู…ุฑ ุงู„ุจู†ุงุก '%s' ูุดู„.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ุงู„ุงุชุตุงู„ ุจู€%s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ุงู„ูˆุญุฏุงุช ุงู„ู…ุฏุนูˆู…ุฉ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -991,7 +999,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1062,7 +1070,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ู‡ูŠ ุงู„ู†ุณุฎุฉ ุงู„ุฃุญุฏุซ.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -1200,8 +1209,8 @@ msgstr "ุงู†ุชู‡ู‰ ูˆู‚ุช ุงู„ุงุชุตุงู„"
 msgid "Server closed the connection"
 msgstr "ุฃุบู„ู‚ ุงู„ุฎุงุฏู… ุงู„ุงุชุตุงู„"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "ุฎุทุฃ ููŠ ุงู„ู‚ุฑุงุกุฉ"
 
@@ -1214,8 +1223,8 @@ msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ุฎุทุฃ ููŠ ุงู„ูƒุชุงุจุฉ"
 
@@ -1269,7 +1278,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "ุชุนุฐุฑ ู‚ุจูˆู„ ุงู„ุงุชุตุงู„"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1296,85 +1305,98 @@ msgstr "ุงุณุชุนู„ุงู…"
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ุงู„ุงุชุตุงู„ ุจู€%s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ุชุนุฐุฑ ุชู…ู‡ูŠุฏ ุงู„ุงุชุตุงู„ ุจู€%s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ุชุนุฐุฑ ุงู„ุงุชุตุงู„ ุจู€%s:%s (%s)ุŒ ุงู†ุชู‡ู‰ ูˆู‚ุช ุงู„ุงุชุตุงู„"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ุชุนุฐุฑ ุงู„ุงุชุตุงู„ ุจู€%s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ุงู„ุงุชุตุงู„ ุจู€%s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, c-format
+msgid "System error resolving '%s:%s'"
+msgstr ""
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ุชุนุฐุฑ ุงู„ุงุชุตุงู„ ุจู€%s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1412,53 +1434,53 @@ msgstr "ุฎุงุฏู… http ู„ู‡ ุฏุนู… ู…ุฏู‰ ู…ุนุทูˆุจ"
 msgid "Unknown date format"
 msgstr "ู†ุณู‚ ุชุงุฑูŠุฎ ู…ุฌู‡ูˆู„"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "ูุดู„ ุงู„ุชุญุฏูŠุฏ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ุงู†ุชู‡ู‰ ูˆู‚ุช ุงู„ุงุชุตุงู„"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ุฎุทุฃ ููŠ ุงู„ูƒุชุงุจุฉ ุฅู„ู‰ ู…ู„ู ุงู„ู…ูุฎุฑุฌุงุช"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ุฎุทุฃ ููŠ ุงู„ูƒุชุงุจุฉ ุฅู„ู‰ ุงู„ู…ู„ู"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ุฎุทุฃ ููŠ ุงู„ูƒุชุงุจุฉ ุฅู„ู‰ ุงู„ู…ู„ู"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ุฎุทุฃ ููŠ ุงู„ู‚ุฑุงุกุฉ ู…ู† ุงู„ุฎุงุฏู…. ุฃู‚ูู„ ุงู„ุทุฑู ุงู„ุขุฎุฑ ุงู„ุงุชุตุงู„"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ุฎุทุฃ ููŠ ุงู„ู‚ุฑุงุกุฉ ู…ู† ุงู„ุฎุงุฏู…"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ุจูŠุงู†ุงุช ุชุฑูˆูŠุณุฉ ุณูŠุฆุฉ"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ูุดู„ ุงู„ุงุชุตุงู„"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ุฎุทุฃ ุฏุงุฎู„ูŠ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "ุชุนุฐุฑุช ู‚ุฑุงุกุฉ %s"
@@ -1485,7 +1507,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "ูุดู„ ุฅุบู„ุงู‚ ุงู„ู…ู„ู %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ูุดู„ ุฅุบู„ุงู‚ ุงู„ู…ู„ู %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1567,7 +1594,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ุชุนุฐุฑุช ุงู„ูƒุชุงุจุฉ ุฅู„ู‰ %s"
@@ -1672,8 +1699,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "ุชุนุฐุฑ ูุชุญ ู…ู„ู ู‚ุงุนุฏุฉ ุงู„ุจูŠุงู†ุงุช %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
@@ -1686,87 +1713,87 @@ msgstr ""
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: ุชุนุฐุฑุช ู‚ุฑุงุกุฉ ุงู„ุฏู„ูŠู„ %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ูุดู„ ูุชุญ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ูุดู„ ุฑุจุท %s ุจู€%s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -1840,7 +1867,7 @@ msgstr ""
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ูุดู„ ุชุบูŠูŠุฑ ุงุณู… %s ุฅู„ู‰ %s"
@@ -1877,23 +1904,23 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "ูุดู„ ุชู†ููŠุฐ gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ุฃุฑุดูŠู ูุงุณุฏ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ูุดู„ ุชุญู‚ู‘ู‚ Checksum ู„ู…ู„ู TarุŒ ุงู„ุฃุฑุดูŠู ูุงุณุฏ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
@@ -1964,54 +1991,54 @@ msgstr "ูุดู„ุช ูƒุชุงุจุฉ ุงู„ู…ู„ู %s"
 msgid "Failed to close file %s"
 msgstr "ูุดู„ ุฅุบู„ุงู‚ ุงู„ู…ู„ู %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ุงู„ู…ุณุงุฑ %s ุทูˆูŠู„ ุฌุฏุงู‹"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "ููƒู‘ ุชุญุฒูŠู… %s ุฃูƒุซุฑ ู…ู† ู…ุฑู‘ุฉ"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ุงู„ู…ุณุงุฑ ุทูˆูŠู„ ุฌุฏุงู‹"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
@@ -2090,30 +2117,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "ุชุนุฐุฑ ุงู„ุนุซูˆุฑ ุนู„ู‰ ุงู„ุชุญุฏูŠุฏ %s"
@@ -2183,6 +2210,16 @@ msgstr "%c%s... ุฎุทุฃ!"
 msgid "%c%s... Done"
 msgstr "%c%s... ุชู…ู‘"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ุชู…ู‘"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2243,114 +2280,120 @@ msgstr ""
 msgid "Problem closing the gzip file %s"
 msgstr "ู…ุดูƒู„ุฉ ููŠ ุฅุบู„ุงู‚ ุงู„ู…ู„ู"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ูุดู„ ุฅุบู„ุงู‚ ุงู„ู…ู„ู %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "ู…ุดูƒู„ุฉ ููŠ ุฅุบู„ุงู‚ ุงู„ู…ู„ู"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ู…ุดูƒู„ุฉ ููŠ ู…ุฒุงู…ู†ุฉ ุงู„ู…ู„ู"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ู…ุดูƒู„ุฉ ููŠ ุฅุบู„ุงู‚ ุงู„ู…ู„ู"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ู…ุดูƒู„ุฉ ููŠ ู…ุฒุงู…ู†ุฉ ุงู„ู…ู„ู"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "ุฅุฌู‡ุงุถ ุงู„ุชุซุจูŠุช."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
@@ -2376,59 +2419,59 @@ msgstr ""
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ูŠุนุชู…ุฏ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "ูŠุนุชู…ุฏ ู…ุณุจู‚ุงู‹"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ูŠุณุชุญุณู†"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ูŠู‚ุชุฑุญ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "ูŠุนุงุฑุถ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ูŠุณุชุจุฏู„"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ูŠูู„ุบูŠ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "ู…ู‡ู…"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ู…ุทู„ูˆุจ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ู‚ูŠุงุณูŠ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ุงุฎุชูŠุงุฑูŠ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ุฅุถุงููŠ"
 
@@ -2529,29 +2572,29 @@ msgstr "ูุชุญ %s"
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "ูุดู„ ุฅุบู„ุงู‚ ุงู„ู…ู„ู %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2570,23 +2613,23 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
@@ -2623,17 +2666,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ุงู„ุฑุฌุงุก ุฅุฏุฎุงู„ ุงู„ู‚ุฑุต ุงู„ู…ูุณู…ู‘ู‰  '%s' ููŠ ุงู„ุณูˆู‘ุงู‚ุฉ '%s' ูˆุถุบุท ู…ูุชุงุญ ุงู„ุฅุฏุฎุงู„."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ู†ุธุงู… ุงู„ุญุฒู… '%s' ุบูŠุฑ ู…ุฏุนูˆู…"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2686,14 +2729,14 @@ msgstr ""
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ุญุฏุซ ุฎุทุฃ ุฃุซู†ุงุก ู…ุนุงู„ุฌุฉ %s (NewVersion1)"
@@ -2714,26 +2757,26 @@ msgstr ""
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ู‚ุฑุงุกุฉ ู‚ูˆุงุฆู… ุงู„ุญุฒู…"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2746,98 +2789,98 @@ msgstr "ูุดู„ ุฅุนุงุฏุฉ ุงู„ุชุณู…ูŠุฉ ุŒ %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ุบูŠุฑ ู…ุชุทุงุจู‚ุฉ"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum ุบูŠุฑ ู…ุชุทุงุจู‚ุฉ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ุชุนุฐุฑ ูุชุญ ู…ู„ู ู‚ุงุนุฏุฉ ุงู„ุจูŠุงู†ุงุช %s: %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ุงู„ุญุฌู… ุบูŠุฑ ู…ุชุทุงุจู‚"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ุชุนุฐุฑ ูุชุญ ู…ู„ู ู‚ุงุนุฏุฉ ุงู„ุจูŠุงู†ุงุช %s: %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "ู„ุงุญุธุŒ ุชุญุฏูŠุฏ %s ุจุฏู„ุงู‹ ู…ู† %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ู„ุงุญุธุŒ ุชุญุฏูŠุฏ %s ุจุฏู„ุงู‹ ู…ู† %s\n"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ุชุนุฐุฑ ูุชุญ ู…ู„ู ู‚ุงุนุฏุฉ ุงู„ุจูŠุงู†ุงุช %s: %s"
@@ -2863,7 +2906,7 @@ msgstr "ุฌุงุฑูŠ ุงู„ุชุนุฑู..."
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "ููƒ ุชุฑูƒูŠุจ ุงู„ู‚ุฑุต ุงู„ู…ุฏู…ุฌ..."
@@ -2924,30 +2967,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ู†ุณุฎ ู‚ูˆุงุฆู… ุงู„ุญุฒู…..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ูƒุชุงุจุฉ ู„ุงุฆุญุฉ ุงู„ู…ุตุงุฏุฑ ุงู„ุฌุฏูŠุฏุฉ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2962,17 +3005,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum ุบูŠุฑ ู…ุชุทุงุจู‚ุฉ"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "ุฅุฌู‡ุงุถ ุงู„ุชุซุจูŠุช."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3036,119 +3068,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "ุชู… ุชุซุจูŠุช %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ุชู‡ูŠุฆุฉ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ุฅุฒุงู„ุฉ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "ุชู…ุช ุฅุฒุงู„ุฉ %s ุจุงู„ูƒุงู…ู„"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "ูุดู„ ุฅุบู„ุงู‚ ุงู„ู…ู„ู %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ุชุญุถูŠุฑ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ูุชุญ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ุงู„ุชุญุถูŠุฑ ู„ุชู‡ูŠุฆุฉ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ุชู… ุชุซุจูŠุช %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ุงู„ุชุญุถูŠุฑ ู„ุฅุฒุงู„ุฉ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ุชู… ุฅุฒุงู„ุฉ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ุงู„ุชุญุถูŠุฑ ู„ุฅุฒุงู„ุฉ %s ุจุงู„ูƒุงู…ู„"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "ุชู…ุช ุฅุฒุงู„ุฉ %s ุจุงู„ูƒุงู…ู„"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3160,13 +3192,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3196,10 +3222,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ุชู…ู‘"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ูุชุญ ู…ู„ู ุงู„ุชู‡ูŠุฆุฉ %s"
 
diff --git a/po/ast.po b/po/ast.po
index 7a7b7d37f..b0cd998e4 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iรฑigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -93,73 +93,73 @@ msgstr "Informe del total d'espaciu: "
 msgid "Package file %s is out of sync."
 msgstr "El ficheru de paquetes %s nun ta sincronizรกu."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nun s'alcontraron paquetes"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Has de dar polo menos un patrรณn de gueta"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nun pue alcontrase'l paquete %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Ficheros de paquete:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "La cachรฉ nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Paquetes na chincheta:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nun s'alcontrรณ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalรกu: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidatu: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(dengรบn)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Chincheta de paquetes: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pa %s compilรกu en %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,20 +235,28 @@ msgstr ""
 "tmp\n"
 "Ver les pรกxines del manual apt-cache(8) y apt.conf(5) pa mรกs informaciรณn.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inxerta un discu nel presรฉu y calca intro"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Fallรณ al montar '%s' a '%s'"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repite'l procesu colos demรกs CDs del conxuntu."
 
@@ -481,7 +489,7 @@ msgstr "La reinstalaciรณn de %s nun ye dable, nun pue descargase.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s yรก ta na versiรณn mรกs nueva.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s axustรกu como instalรกu manualmente.\n"
@@ -588,8 +596,8 @@ msgstr "Tres d'esta operaciรณn, van usase %sB d'espaciu de discu adicional.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Tres d'esta operaciรณn, van lliberase %sB d'espaciu de discu.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nun pue determinase l'espaciu llibre de %s"
@@ -628,7 +636,7 @@ msgstr "Encaboxar."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ยฟQuies continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fallรณ algamar %s  %s\n"
@@ -637,7 +645,7 @@ msgstr "Fallรณ algamar %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en mou de sรณlo descarga"
 
@@ -721,7 +729,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente informaciรณn pue aidar a resolver la situaciรณn:"
 
@@ -772,7 +780,7 @@ msgstr ""
 "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseรฑa una soluciรณn)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -784,78 +792,78 @@ msgstr ""
 "inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Paquetes fraรฑaos"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Instalarรกnse los siguientes paquetes extra:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Paquetes afalaos:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Paquetes encamentaos"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s axustรกu como instalรกu automรกticamente.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calculando l'anovamientu... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fallรณ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Fecho"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error internu, l'iguador de problemes fraรฑรณ coses"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Descargando %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Has de conseรฑar polo menos un paquete p'algamar so fonte"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nun pudo alcontrase un paquete fonte pa %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -864,7 +872,7 @@ msgstr ""
 "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -876,87 +884,87 @@ msgstr ""
 "pa baxar los caberos anovamientos (posiblemente tovรญa nun sacaos) pal "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yรก descargรกu '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nun hai espaciu llibre bastante en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai falta descargar %sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fonte descargada %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Fallรณ la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saltando'l desempaquetรกu de la fonte yรก desempaquetada en %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallรณ la orde de desempaquetรกu '%s'.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalรกu.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallรณ la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Fallรณ el procesu fรญu"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Hai que conseรฑar polo menos un paquete pa verificar les dependencies de "
 "construcciรณn"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nun pudo algamase informaciรณn de dependencies de construcciรณn pa %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcciรณn.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -965,7 +973,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -974,14 +982,14 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalรกu %s ye "
 "enforma nuevu"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -990,7 +998,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque denguna versiรณn "
 "disponible del paquete %s satisfaz los requisitos de versiรณn"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -999,30 +1007,30 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Les dependencies de construcciรณn de %s nun pudieron satisfacese."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcciรณn"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรณdulos sofitaos:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1113,7 +1121,7 @@ msgstr ""
 "pa mรกs informaciรณn y opciones.\n"
 "                       Esti APT tien Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1189,7 +1197,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s yรก ta na versiรณn mรกs nueva.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellรญ"
@@ -1327,8 +1336,8 @@ msgstr "Gandiรณ'l tiempu de conexรณn"
 msgid "Server closed the connection"
 msgstr "El sirvidor zarrรณ la conexรณn"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Fallu de llectura"
 
@@ -1341,8 +1350,8 @@ msgid "Protocol corruption"
 msgstr "Corrupciรณn del protocolu"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Fallu d'escritura"
 
@@ -1396,7 +1405,7 @@ msgstr "Gandiรณ'l tiempu de conexรณn col zรณcalu de datos"
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexรณn"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
@@ -1423,86 +1432,99 @@ msgstr "Consulta"
 msgid "Unable to invoke "
 msgstr "Nun se pudo invocar "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nun se pudo coneutar a %s:%s (%s); expirรณ'l tiempu de conexรณn"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Coneutando a %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nun se pudo resolver '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallu temporal al resolver '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Daquรฉ raro asocediรณ resolviendo '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Daquรฉ raro asocediรณ resolviendo '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nun pudo coneutase a %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Atopรณse polo menos una robla mala."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nun pudo executase 'gpgv' pa verificar la robla (ยฟta instalรกu gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Fallu desconocรญu al executar gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Les siguientes robles nun valieron:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1542,53 +1564,53 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
 msgid "Unknown date format"
 msgstr "Formatu de data desconocรญu"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Fallรณ la escoyeta"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Gandiรณ'l tiempu de conexรณn"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fallu al lleer nel sirvidor. El llau remotu zarrรณ la conexรณn."
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Fallo la conexรณn"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Fallu internu"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
@@ -1615,7 +1637,12 @@ msgstr "Nun s'alcontrรณ ficheru espeyu '%s'"
 msgid "Can not read mirror file '%s'"
 msgstr "Nun s'alcontrรณ ficheru espeyu '%s'"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nun s'alcontrรณ ficheru espeyu '%s'"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Espeyu: %s]"
@@ -1715,7 +1742,7 @@ msgstr ""
 "-o=? Afita una opciรณn de configuraciรณn arbitraria, p. ej. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nun se pue escribir en %s"
@@ -1861,8 +1888,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nun pudo lleese %s"
@@ -1875,87 +1902,87 @@ msgstr "L'archivu nun tien rexistru de control"
 msgid "Unable to get a cursor"
 msgstr "Nun pudo algamase un cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Nun pudo lleese'l direutoriu %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Nun pudo lleese %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Errores aplicables al ficheru "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nun pudo resolvese %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Fallรณ'l percorrรญu pol รกrbol"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nun pudo abrise %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Desenllazar %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nun pudo lleese l'enllaz %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nun pudo desenllazase %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Fallรณ enllazar enllazr %s a %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Alcanzose'l llรญmite of %sB de desenllaz.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "L'archivu nun tien el campu paquetes"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nun tien la entrada saltos\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el curiador de %s ye %s y non %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nun tien la entrada saltos de fonte\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -2029,7 +2056,7 @@ msgstr "Nun pudo lleese al computar MD5"
 msgid "Problem unlinking %s"
 msgstr "Problema al desenllazar %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nun pudo renomase %s como %s"
@@ -2089,23 +2116,23 @@ msgstr ""
 "-o=? Afita una opciรณn de configuraciรณn arbitraria, p. ej. -o dir::\n"
 "cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Fallu al crear les tuberรญes"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Fallu al executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Ficheru tollรญu"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Fallรณ la suma de control de tar, ficheru tollรญu"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Testera  del TAR triba %u desconocida, miembru %s"
@@ -2176,54 +2203,54 @@ msgstr "Fallรณ la escritura nel ficheru %s"
 msgid "Failed to close file %s"
 msgstr "Fallรณ al pesllar el ficheru %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "La trayeutoria %s ye enforma llarga"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s mรกs d'una vegada"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El direutorio %s ta desviรกu"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "El paquete ta tentando escribir nel oxetivu desviรกu %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "La trayeutoria de desviaciรณn ye enforma llarga"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "El direutoriu %s ta reemplazรกndose por un non-direutoriu"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "La trayeutoria ye perllarga"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Sobreescribiendo concordancia del paquete ensin versiรณn pa %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nun ye a lleer %s"
@@ -2304,30 +2331,30 @@ msgstr ""
 "desactivao pol usuariu."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Escoyeta %s que nun s'atopa"
@@ -2400,6 +2427,16 @@ msgstr "%c%s... ยกFallu!"
 msgid "%c%s... Done"
 msgstr "%c%s... Fecho"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fecho"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2460,114 +2497,120 @@ msgstr "Nun se pudo montar el CD-ROM"
 msgid "Problem closing the gzip file %s"
 msgstr "Problemes zarrando'l ficheru gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nun ta usรกndose bloquรฉu pal ficheru de bloquรฉu de sรณlo llectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nun puede abrise'l ficheru de bloquรฉu %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nun ta usรกndose bloquรฉu pal ficheru de bloquรฉu %s montรกu per nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nun se pudo torgar %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subprocesu %s recibiรณ un fallu de segmentaciรณn."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subprocesu %s recibiรณ una seรฑal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subprocesu %s devolviรณ un cรณdigu d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subprocesu %s terminรณ de manera inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nun se pudo abrir el ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nun pudo abrise un ficheru descriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Nun pudo criase'l soprocesu IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Nun pudo executase'l compresor "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lleรญos, entรก tenรญa de lleer %lu pero nun queda nada"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, entรก tenรญa d'escribir %lu pero nun pudo facerse"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problemes zarrando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Hai problemes al renomar el ficheru %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Hai problemes desvenceyando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Hai problemes al sincronizar el ficheru"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "L'aniellu de claves nun s'instalรณ en %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cachรฉ de paquetes balera."
@@ -2594,59 +2637,59 @@ msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "La cachรฉ de paquetes creรณse pa una arquitectura estremada"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depende de"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Predepende de"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Suxer"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "En conflictu con"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Sustituye a"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Fai obsoletu a"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Ruempe"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "requerรญu"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "estรกndar"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2749,17 +2792,17 @@ msgstr "Abriendo %s"
 msgid "Line %u too long in source list %s."
 msgstr "Llinia %u enforma llarga na llista d'orรญxenes %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinia %u mal formada na llista d'orรญxenes %s (triba)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Triba '%s' desconocida na llinia %u de la llista d'orรญxenes %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2768,12 +2811,12 @@ msgstr ""
 "Nun pudรณ facese la configuraciรณn inmediatamente en '%s'. Por favor, mira man "
 "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2796,7 +2839,7 @@ msgid ""
 msgstr ""
 "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2804,11 +2847,11 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve xenerรณ fraรฑadures, esto puede ser pola "
 "mor de paquetes retenรญos."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nun pueden iguase los problemes; tienes paquetes fraรฑaos retenรญos."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2817,7 +2860,7 @@ msgstr ""
 "Nun pudieron descargase dellos ficheros d'รญndiz; inorรกronse o usรกronse los "
 "antiguos nel so llugar."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta'l direutoriu de llistes %spartial."
@@ -2854,17 +2897,17 @@ msgstr "Nun pudo alncontrase'l controlador de mรฉtodu %s."
 msgid "Method %s did not start correctly"
 msgstr "El mรฉtodu %s nun entamรณ correchamente"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, introduz el discu '%s' nel presรฉu '%s' y calca Intro."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetรกu '%s' nun ta sofitรกu"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nun pudo determinase una triba de sistema d'empaquetรกu afayadiza"
 
@@ -2919,14 +2962,14 @@ msgstr "La cachรฉ tien un sistema de versiones incompatible"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Hebo un error al procesar %s (FindPkg)"
@@ -2948,26 +2991,26 @@ msgstr "Coime, perpasaste'l nรบmberu de descripciones qu'esti APT ye a remanar."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Vaya, perpasaste'l nรบmberu de dependencies coles que puede esti APT."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Al procesar dependencies de ficheros nun s'alcontrรณ el paquete %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nun se puede lleer la llista de paquetes d'orรญxenes %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lleendo llista de paquetes"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Recoyendo ficheros qu'apurren"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Fallu de E/S al grabar cachรฉ d'orรญxenes"
 
@@ -2980,55 +3023,55 @@ msgstr "fallรณ'l cambiu de nome, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 nun concasa"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nun se pudo parchear el ficheru release %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nun hai clave pรบblica denguna disponible pa les IDs de clave darrรฉu:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflictu de distribuciรณn: %s (esperรกbase %s pero obtรบvose %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Hebo un fallu durante la verificaciรณn de la robla. El repositoriu nun ta "
 "anovรกu y va usase un ficheru รญndiz. Fallu GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Fallu GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3037,7 +3080,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete (por faltar una arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3046,7 +3089,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3054,31 +3097,31 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompรญos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "El tamaรฑu nun concasa"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nun se pudo parchear el ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ensin seiciones nel ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ensin entrada Hash nel ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Entrada invรกlida pa 'Valid-Until' nel ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada invรกlida pa 'Date' nel ficheru release %s"
@@ -3106,7 +3149,7 @@ msgstr "Identificando.. "
 msgid "Stored label: %s\n"
 msgstr "Etiqueta guardada: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando l CD-ROM...\n"
 
@@ -3170,30 +3213,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copiando les llistes de paquetes..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Escribiendo llista nueva d'orรญxenes\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entraes de la llista d'orรญxenes pa esti discu son:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rexistros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i rexistros escritos con %i ficheros de menos.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3210,17 +3253,6 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticaciรณn pa: %s"
 msgid "Hash mismatch for: %s"
 msgstr "El hash nun concasa pa: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "L'aniellu de claves nun s'instalรณ en %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3292,115 +3324,115 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Desinstalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Desinstalรณse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Anotando desaniciรกu de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando activador de post-instalaciรณn de %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta'l direutoriu '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparรกndose pa configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalรกu"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparรกndose pa desinstalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s desinstalรกu"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparรกndose pa desinstalar dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Desinstalรณse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nun puede escribise nel rexistru, fallรณ openpty() (ยฟ/dev/pts nun ta "
 "montรกu?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Executando dpkt"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ensin informe escritu d'apport porque MaxReports llegรณ dafechu"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependencies - dรฉxase ensin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3408,7 +3440,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
 "siguiรณ dende un fallu previu"
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3424,13 +3456,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3465,21 +3491,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloquiรกu"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Daquรฉ raro asocediรณ resolviendo '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Fecho"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Hebo un fallu durante la verificaciรณn de la robla. El repositoriu nun ta "
-#~ "anovรกu y va usase un ficheru รญndiz. Fallu GPG: %s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Saltando'l ficheru non esistente %s"
 
diff --git a/po/bg.po b/po/bg.po
index 55e29d566..f4106df3b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -99,73 +99,73 @@ msgstr "ะžะฑั‰ะพ ะพั‚ั‡ะตั‚ะตะฝะพ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะพ: "
 msgid "Package file %s is out of sync."
 msgstr "ะŸะฐะบะตั‚ะฝะธัั‚ ั„ะฐะนะป %s ะฝะต ะต ัะธะฝั…ั€ะพะฝะธะทะธั€ะฐะฝ."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ะัะผะฐ ะฝะฐะผะตั€ะตะฝะธ ะฟะฐะบะตั‚ะธ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "ะขั€ัะฑะฒะฐ ะดะฐ ะฒัŠะฒะตะดะตั‚ะต ะฟะพะฝะต ะตะดะธะฝ ัˆะฐะฑะปะพะฝ ะทะฐ ั‚ัŠั€ัะตะฝะต"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "ะขะฐะทะธ ะบะพะผะฐะฝะดะฐั‚ะฐ ะต ะพัั‚ะฐั€ัะปะฐ. ะ˜ะทะฟะพะปะทะฒะฐะนั‚ะต โ€žapt-mark showautoโ€œ ะฒะผะตัั‚ะพ ะฝะตั."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ะŸะฐะบะตั‚ัŠั‚ %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะฐะผะตั€ะตะฝ"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ะŸะฐะบะตั‚ะฝะธ ั„ะฐะนะปะพะฒะต:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "ะšะตัˆัŠั‚ ะฝะต ะต ัะธะฝั…ั€ะพะฝะธะทะธั€ะฐะฝ, ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัŠะปะฝะธ โ€žx-refโ€œ ะฝะฐ ะฟะฐะบะตั‚ะตะฝ ั„ะฐะนะป"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ะžั‚ะฑะธั‚ะธ ะฟะฐะบะตั‚ะธ:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ะฝะต ัะฐ ะฝะฐะผะตั€ะตะฝะธ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ะ˜ะฝัั‚ะฐะปะธั€ะฐะฝะฐ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ะšะฐะฝะดะธะดะฐั‚: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ะฝัะผะฐ)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ะžั‚ะฑะธะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตั‚ะฐ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ะขะฐะฑะปะธั†ะฐ ั ะฒะตั€ัะธะธั‚ะต:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ะทะฐ %s ะบะพะผะฟะธะปะธั€ะฐะฝ ะฝะฐ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,20 +236,28 @@ msgstr ""
 "cache=/tmp\n"
 "ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฒะธะถั‚ะต ะฝะฐั€ัŠั‡ะฝะธั†ะธั‚ะต apt-cache(8) ะธ apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "ะฃะบะฐะถะตั‚ะต ะธะผะต ะทะฐ ั‚ะพะทะธ ะดะธัะบ, ะฝะฐะฟั€ะธะผะตั€ โ€žDebian 5.0.3 Disk1โ€œ"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ะกะปะพะถะตั‚ะต ะดะธัะบ ะฒ ัƒัั‚ั€ะพะนัั‚ะฒะพั‚ะพ ะธ ะฝะฐั‚ะธัะฝะตั‚ะต โ€žEnterโ€œ"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะผะพะฝั‚ะธั€ะฐะฝะต ะฝะฐ %s ะฝะฐ %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ะŸะพะฒั‚ะพั€ะตั‚ะต ั‚ะพะทะธ ะฟั€ะพั†ะตั ะทะฐ ะพัั‚ะฐะฝะฐะปะธั‚ะต ะดะธัะบะพะฒะต ะพั‚ ะบะพะผะฟะปะตะบั‚ะฐ."
 
@@ -486,7 +494,7 @@ msgstr "ะŸั€ะตะธะฝัั‚ะฐะปะฐั†ะธัั‚ะฐ ะฝะฐ %s ะฝะต ะต ะฒัŠะทะผะพะถะฝะฐ, ะฝะต ะผ
 msgid "%s is already the newest version.\n"
 msgstr "%s ะฒะตั‡ะต ะต ะฝะฐะน-ะฝะพะฒะฐั‚ะฐ ะฒะตั€ัะธั.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ะต ะพั‚ะฑะตะปัะทะฐะฝ ะบะฐั‚ะพ ั€ัŠั‡ะฝะพ ะธะฝัั‚ะฐะปะธั€ะฐะฝ.\n"
@@ -598,8 +606,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ะกะปะตะด ั‚ะฐะทะธ ะพะฟะตั€ะฐั†ะธั ั‰ะต ะฑัŠะดะต ะพัะฒะพะฑะพะดะตะฝะพ %sB ะดะธัะบะพะฒะพ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะพ.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพะฟั€ะตะดะตะปัะฝะตั‚ะพ ะฝะฐ ัะฒะพะฑะพะดะฝะพั‚ะพ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะพ ะฒ %s"
@@ -638,7 +646,7 @@ msgstr "ะŸั€ะตะบัŠัะฒะฐะฝะต."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ะ˜ัะบะฐั‚ะต ะปะธ ะดะฐ ะฟั€ะพะดัŠะปะถะธั‚ะต [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทั‚ะตะณะปัะฝะตั‚ะพ ะฝะฐ %s  %s\n"
@@ -647,7 +655,7 @@ msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทั‚ะตะณะปัะฝะตั‚ะพ ะฝะฐ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "ะัะบะพะธ ั„ะฐะนะปะพะฒะต ะฝะต ะผะพะถะฐั…ะฐ ะดะฐ ะฑัŠะดะฐั‚ ะธะทั‚ะตะณะปะตะฝะธ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ะ˜ะทั‚ะตะณะปัะฝะตั‚ะพ ะทะฐะฒัŠั€ัˆะธ ะฒ ั€ะตะถะธะผ ัะฐะผะพ ะฝะฐ ะธะทั‚ะตะณะปัะฝะต"
 
@@ -731,7 +739,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "ะกะปะตะดะฝะฐั‚ะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะผะพะถะต ะดะฐ ะฟะพะผะพะณะฝะต ะทะฐ ะฝะฐะผะธั€ะฐะฝะต ะฝะฐ ะธะทั…ะพะด ะพั‚ ัะธั‚ัƒะฐั†ะธัั‚ะฐ:"
@@ -781,7 +789,7 @@ msgstr ""
 "ะะตัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะธ ะทะฐะฒะธัะธะผะพัั‚ะธ. ะžะฟะธั‚ะฐะนั‚ะต โ€žapt-get -f installโ€œ ะฑะตะท ะฟะฐะบะตั‚ะธ (ะธะปะธ "
 "ัƒะบะฐะถะตั‚ะต ั€ะฐะทั€ะตัˆะตะฝะธะต)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -793,33 +801,33 @@ msgstr ""
 "ะดะธัั‚ั€ะธะฑัƒั†ะธั, ั‡ะต ะฝัะบะพะธ ะฝะตะพะฑั…ะพะดะธะผะธ ะฟะฐะบะตั‚ะธ ะพั‰ะต ะฝะต ัะฐ ััŠะทะดะฐะดะตะฝะธ ะธะปะธ ะฟัŠะบ\n"
 "ัะฐ ะฑะธะปะธ ะฟั€ะตะผะตัั‚ะตะฝะธ ะพั‚ Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ะกั‡ัƒะฟะตะฝะธ ะฟะฐะบะตั‚ะธ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ะกะปะตะดะฝะธั‚ะต ะดะพะฟัŠะปะฝะธั‚ะตะปะฝะธ ะฟะฐะบะตั‚ะธ ั‰ะต ะฑัŠะดะฐั‚ ะธะฝัั‚ะฐะปะธั€ะฐะฝะธ:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ะŸั€ะตะดะปะพะถะตะฝะธ ะฟะฐะบะตั‚ะธ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ะŸั€ะตะฟะพั€ัŠั‡ะฒะฐะฝะธ ะฟะฐะบะตั‚ะธ:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฟะฐะบะตั‚ %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ะต ะพั‚ะฑะตะปัะทะฐะฝ ะบะฐั‚ะพ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ะธะฝัั‚ะฐะปะธั€ะฐะฝ.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -827,46 +835,46 @@ msgstr ""
 "ะขะฐะทะธ ะบะพะผะฐะฝะดะฐ ะต ะพัั‚ะฐั€ัะปะฐ. ะ’ะผะตัั‚ะพ ะฝะตั ะธะทะฟะพะปะทะฒะฐะนั‚ะต โ€žapt-mark autoโ€œ ะธ โ€žapt-mark "
 "manualโ€œ."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ะ˜ะทั‡ะธัะปัะฒะฐะฝะต ะฝะฐ ะฐะบั‚ัƒะฐะปะธะทะฐั†ะธัั‚ะฐ..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ะะตัƒัะฟะตั…"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ะ“ะพั‚ะพะฒะพ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ะ’ัŠั‚ั€ะตัˆะฝะฐ ะณั€ะตัˆะบะฐ, โ€žproblem resolverโ€œ ัั‡ัƒะฟะธ ะฝะตั‰ะพ ะฒ ัะธัั‚ะตะผะฐั‚ะฐ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะทะฐะบะปัŽั‡ะฒะฐะฝะตั‚ะพ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ะทะฐ ะธะทั‚ะตะณะปัะฝะต"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ะะต ะต ะพั‚ะบั€ะธั‚ ะธะทั‚ะพั‡ะฝะธะบ, ะพั‚ ะบะพะนั‚ะพ ะดะฐ ัะต ะธะทั‚ะตะณะปะธ ะฒะตั€ัะธั โ€ž%sโ€œ ะฝะฐ โ€ž%sโ€œ"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "ะ˜ะทั‚ะตะณะปัะฝะต ะฝะฐ %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "ะขั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะฟะพะฝะต ะตะดะธะฝ ะฟะฐะบะตั‚ ะทะฐ ะธะทั‚ะตะณะปัะฝะต ะฝะฐ ะธะทั…ะพะดะฝะธั ะผัƒ ะบะพะด"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะธะทั…ะพะดะตะฝ ะบะพะด ะฝะฐ ะฟะฐะบะตั‚ %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -876,7 +884,7 @@ msgstr ""
 "ะฐะดั€ะตั:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -888,70 +896,70 @@ msgstr ""
 "ะทะฐ ะดะฐ ะธะทั‚ะตะณะปะธั‚ะต ะฟะพัะปะตะดะฝะธั‚ะต ะฟั€ะพะผะตะฝะธ ะฒ ะฟะฐะบะตั‚ะฐ (ะตะฒะตะฝั‚ัƒะฐะปะฝะพ ะฒ ะฟั€ะพั†ะตั ะฝะฐ "
 "ั€ะฐะทั€ะฐะฑะพั‚ะบะฐ).\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ะŸั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ะฒะตั‡ะต ะธะทั‚ะตะณะปะตะฝะธั ั„ะฐะนะป โ€ž%sโ€œ\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ะัะผะฐั‚ะต ะดะพัั‚ะฐั‚ัŠั‡ะฝะพ ัะฒะพะฑะพะดะฝะพ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะพ ะฒ %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ะะตะพะฑั…ะพะดะธะผะพ ะต ะดะฐ ัะต ะธะทั‚ะตะณะปัั‚ %sB/%sB ะฐั€ั…ะธะฒะธ ะธะทั…ะพะดะตะฝ ะบะพะด.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ะะตะพะฑั…ะพะดะธะผะพ ะต ะดะฐ ัะต ะธะทั‚ะตะณะปัั‚ %sB ะฐั€ั…ะธะฒะธ ะธะทั…ะพะดะตะฝ ะบะพะด.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ะ˜ะทั‚ะตะณะปัะฝะต ะฝะฐ ะธะทั…ะพะดะตะฝ ะบะพะด %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทั‚ะตะณะปัะฝะตั‚ะพ ะฝะฐ ะฝัะบะพะธ ะฐั€ั…ะธะฒะธ."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "ะŸั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฒะตั‡ะต ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะธั ะธะทั…ะพะดะตะฝ ะบะพะด ะฒ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ ะทะฐ ั€ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต โ€ž%sโ€œ ะฟั€ะพะฟะฐะดะฝะฐ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ะŸั€ะพะฒะตั€ะตั‚ะต ะดะฐะปะธ ะธะผะฐั‚ะต ะธะฝัั‚ะฐะปะธั€ะฐะฝ ะฟะฐะบะตั‚ะฐ โ€ždpkg-devโ€œ.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ะšะพะผะฐะฝะดะฐั‚ะฐ ะทะฐ ะบะพะผะฟะธะปะธั€ะฐะฝะต โ€ž%sโ€œ ะฟั€ะพะฟะฐะดะฝะฐ.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ะŸั€ะพั†ะตััŠั‚-ะฟะพั‚ะพะผัŠะบ ะฟั€ะพะฟะฐะดะฝะฐ"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ะขั€ัะฑะฒะฐ ะดะฐ ัƒะบะฐะถะตั‚ะต ะฟะพะฝะต ะตะดะธะฝ ะฟะฐะบะตั‚ ะทะฐ ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ะทะฐะฒะธัะธะผะพัั‚ะธ ะทะฐ ะบะพะผะฟะธะปะธั€ะฐะฝะต"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -960,18 +968,18 @@ msgstr ""
 "ะ›ะธะฟัะฒะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฐั€ั…ะธั‚ะตะบั‚ัƒั€ะฐั‚ะฐ %s. ะŸั€ะตะณะปะตะดะฐะนั‚ะต ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะทะฐ APT::"
 "Architectures ะฒ apt.conf(5)."
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟะพะปัƒั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะทะฐะฒะธัะธะผะพัั‚ะธั‚ะต ะทะฐ ะบะพะผะฟะธะปะธั€ะฐะฝะต ะฝะฐ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ะฝัะผะฐ ะทะฐะฒะธัะธะผะพัั‚ะธ ะทะฐ ะบะพะผะฟะธะปะธั€ะฐะฝะต.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -980,7 +988,7 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ %s ะทะฐ ะฟะฐะบะตั‚ะฐ %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, %s ะฝะต ัะต ะฟะพะทะฒะพะปัะฒะฐ "
 "ะทะฐ ะฟะฐะบะตั‚ะธ โ€ž%sโ€œ"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -989,14 +997,14 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ %s ะทะฐ ะฟะฐะบะตั‚ะฐ %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ะฟะพะฝะตะถะต ะฟะฐะบะตั‚ะฐ %s "
 "ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ะฝะฐะผะตั€ะตะฝ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ัƒะดะพะฒะปะตั‚ะฒะพั€ัะฒะฐะฝะตั‚ะพ ะฝะฐ ะทะฐะฒะธัะธะผะพัั‚ %s ะทะฐ ะฟะฐะบะตั‚ะฐ %s: ะ˜ะฝัั‚ะฐะปะธั€ะฐะฝะธัั‚ "
 "ะฟะฐะบะตั‚ %s ะต ั‚ะฒัŠั€ะดะต ะฝะพะฒ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1005,7 +1013,7 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ %s ะทะฐ ะฟะฐะบะตั‚ะฐ %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ะฟะพะฝะตะถะต ะฒะตั€ัะธัั‚ะฐ "
 "ะบะฐะฝะดะธะดะฐั‚ ะฝะฐ ะฟะฐะบะตั‚ะฐ %s ะฝะต ะผะพะถะต ะดะฐ ัƒะดะพะฒะปะตั‚ะฒะพั€ะธ ะธะทะธัะบะฒะฐะฝะตั‚ะพ ะทะฐ ะฒะตั€ัะธั"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1014,30 +1022,30 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ %s ะทะฐ ะฟะฐะบะตั‚ะฐ %s ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ะฟะพะฝะตะถะต ะฟะฐะบะตั‚ะฐ %s "
 "ะฝัะผะฐ ะฟะพะดั…ะพะดัั‰ะธ ะฒะตั€ัะธะธ"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ัƒะดะพะฒะปะตั‚ะฒะพั€ัะฒะฐะฝะตั‚ะพ ะฝะฐ ะทะฐะฒะธัะธะผะพัั‚ %s ะทะฐ ะฟะฐะบะตั‚ะฐ %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ะ—ะฐะฒะธัะธะผะพัั‚ะธั‚ะต ะทะฐ ะบะพะผะฟะธะปะธั€ะฐะฝะต ะฝะฐ %s ะฝะต ะผะพะถะฐั…ะฐ ะดะฐ ะฑัŠะดะฐั‚ ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะธ."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐั‚ะฐ ะฝะฐ ะทะฐะฒะธัะธะผะพัั‚ะธั‚ะต ะทะฐ ะบะพะผะฟะธะปะธั€ะฐะฝะต"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ะ–ัƒั€ะฝะฐะป ะฝะฐ ะฟั€ะพะผะตะฝะธั‚ะต ะฒ %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ะŸะพะดะดัŠั€ะถะฐะฝะธ ะผะพะดัƒะปะธ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1127,7 +1135,7 @@ msgstr ""
 "ะธะฝั„ะพั€ะผะฐั†ะธั ะธ ะพะฟั†ะธะธ.\n"
 "                           ะขะพะฒะฐ APT ะธะผะฐ ะ’ัŠั€ั…ะพะฒะฝะธ ะกะธะปะธ.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1202,7 +1210,8 @@ msgid "%s was already not hold.\n"
 msgstr "ะŸะฐะบะตั‚ัŠั‚ โ€ž%sโ€œ ะฒะตั‡ะต ะต ะทะฐะดัŠั€ะถะฐะฝ.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ะ˜ะทั‡ะฐะบะฐ ัะต ะทะฐะฒัŠั€ัˆะฒะฐะฝะตั‚ะพ ะฝะฐ %s, ะฝะพ ั‚ะพะน ะฝะต ะฑะตัˆะต ะฟัƒัะฝะฐั‚"
@@ -1359,8 +1368,8 @@ msgstr "ะ”ะพะฟัƒัั‚ะธะผะพั‚ะพ ะฒั€ะตะผะต ะทะฐ ัะฒัŠั€ะทะฒะฐะฝะตั‚ะพ ะธะทั‚ะตั‡
 msgid "Server closed the connection"
 msgstr "ะกัŠั€ะฒัŠั€ัŠั‚ ั€ะฐะทะฟะฐะดะฝะฐ ะฒั€ัŠะทะบะฐั‚ะฐ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต"
 
@@ -1373,8 +1382,8 @@ msgid "Protocol corruption"
 msgstr "ะ ะฐะทะฒะฐะปะตะฝ ะฟั€ะพั‚ะพะบะพะป"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธั"
 
@@ -1430,7 +1439,7 @@ msgstr "ะ’ั€ะตะผะตั‚ะพ ะทะฐ ัƒัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฒั€ัŠะทะบะฐ ั ะณะฝะต
 msgid "Unable to accept connection"
 msgstr "ะะตะฒัŠะทะผะพะถะฝะพ ะต ะดะฐ ัะต ะฟั€ะธะตะผะต ัะฒัŠั€ะทะฒะฐะฝะตั‚ะพ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ะŸั€ะพะฑะปะตะผ ะฟั€ะธ ั…ะตัˆะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ"
 
@@ -1457,89 +1466,102 @@ msgstr "ะ—ะฐะฟะธั‚ะฒะฐะฝะต"
 msgid "Unable to invoke "
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทะฒะธะบะฒะฐะฝะตั‚ะพ ะฝะฐ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ะกะฒัŠั€ะทะฒะฐะฝะต ั %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะณะฝะตะทะดะพ ะทะฐ %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะพั‡ะฝะต ัะฒัŠั€ะทะฒะฐะฝะต ั %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ัะฒัŠั€ะทะฒะฐะฝะต ั %s:%s (%s), ะดะพะฟัƒัั‚ะธะผะพั‚ะพ ะฒั€ะตะผะต ะธะทั‚ะตั‡ะต"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ัะฒัŠั€ะทะฒะฐะฝะต ั %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ะกะฒัŠั€ะทะฒะฐะฝะต ั %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ IP ะฐะดั€ะตัะฐ ะฝะฐ โ€ž%sโ€œ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ะ’ั€ะตะผะตะฝะตะฝ ะฝะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ IP ะฐะดั€ะตัะฐ ะฝะฐ โ€ž%sโ€œ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "ะะตั‰ะพ ะปะพัˆะพ ัะต ัะปัƒั‡ะธ ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ IP ะฐะดั€ะตัะฐ ะฝะฐ โ€ž%s:%sโ€œ (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ะะตั‰ะพ ะปะพัˆะพ ัะต ัะปัƒั‡ะธ ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ IP ะฐะดั€ะตัะฐ ะฝะฐ โ€ž%s:%sโ€œ (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ัะฒัŠั€ะทะฒะฐะฝะต ั %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ะ’ัŠั‚ั€ะตัˆะฝะฐ ะณั€ะตัˆะบะฐ: ะ’ะฐะปะธะดะตะฝ ะฟะพะดะฟะธั, ะฝะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพะฒะตั€ะธ ะพั‚ะฟะตั‡ะฐั‚ัŠะบะฐ ะฝะฐ "
 "ะบะปัŽั‡ะฐ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "ะะฐะผะตั€ะตะฝ ะต ะฟะพะฝะต ะตะดะธะฝ ะฝะตะฒะฐะปะธะดะตะฝ ะฟะพะดะฟะธั."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ โ€žgpgvโ€œ ะทะฐ ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ะฟะพะดะฟะธัะฐ (ะธะฝัั‚ะฐะปะธั€ะฐะฝ ะปะธ ะต "
 "gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "ะะตะธะทะฒะตัั‚ะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ ะฝะฐ gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ะกะปะตะดะฝะธั‚ะต ะฟะพะดะฟะธัะธ ัะฐ ะฝะตะฒะฐะปะธะดะฝะธ:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1579,53 +1601,53 @@ msgstr "HTTP ััŠั€ะฒัŠั€ัŠั‚ ะฝัะผะฐ ะฟะพะดะดั€ัŠะถะบะฐ ะทะฐ ะฟั€ะตั…ะฒัŠั€ะปั
 msgid "Unknown date format"
 msgstr "ะะตะธะทะฒะตัั‚ะตะฝ ั„ะพั€ะผะฐั‚ ะฝะฐ ะดะฐั‚ะฐ"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "ะะตัƒัะฟะตั… ะฝะฐ ะธะทะฑะพั€ะฐ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ะ”ะพะฟัƒัั‚ะธะผะพั‚ะพ ะฒั€ะตะผะต ะทะฐ ัะฒัŠั€ะทะฒะฐะฝะต ะธะทั‚ะตั‡ะต"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธัะฐ ะฝะฐ ะธะทั…ะพะดะตะฝ ั„ะฐะนะป"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธัะฐ ะฝะฐ ั„ะฐะนะป"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธัะฐ ะฝะฐ ั„ะฐะนะปะฐ"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต ะพั‚ ััŠั€ะฒัŠั€ะฐ. ะžั‚ะดะฐะปะตั‡ะตะฝะธัั‚ ััŠั€ะฒัŠั€ ะฟั€ะตะบัŠัะฝะฐ ะฒั€ัŠะทะบะฐั‚ะฐ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต ะพั‚ ััŠั€ะฒัŠั€ะฐ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ะะตะฒะฐะปะธะดะฝะธ ะดะฐะฝะฝะธ ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐั‚ะฐ ั‡ะฐัั‚"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ัะฒัŠั€ะทะฒะฐะฝะตั‚ะพ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ะ’ัŠั‚ั€ะตัˆะฝะฐ ะณั€ะตัˆะบะฐ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ั‡ะตั‚ะตะฝะตั‚ะพ ะฝะฐ %s"
@@ -1652,7 +1674,12 @@ msgstr "ะคะฐะนะปัŠั‚ โ€ž%sโ€œ ะฝะฐ ะพะณะปะตะดะฐะปะฝะธั ััŠั€ะฒัŠั€ ะฝะต ะต ะฝะ
 msgid "Can not read mirror file '%s'"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต ั„ะฐะนะปะฐ โ€ž%sโ€œ ะพั‚ ะพะณะปะตะดะฐะปะฝะธั ััŠั€ะฒัŠั€"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต ั„ะฐะนะปะฐ โ€ž%sโ€œ ะพั‚ ะพะณะปะตะดะฐะปะฝะธั ััŠั€ะฒัŠั€"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[ะžะณะปะตะดะฐะปะตะฝ ััŠั€ะฒัŠั€: %s]"
@@ -1750,7 +1777,7 @@ msgstr ""
 "  -o=? ะะฐัั‚ั€ะพะนะฒะฐะฝะต ะฝะฐ ะฟั€ะพะธะทะฒะพะปะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะฐ ะพะฟั†ะธั, ั‚.ะต. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะทะฐะฟะธัะฐ ะฝะฐ %s"
@@ -1900,8 +1927,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะป %s ะพั‚ ะ‘ะ”: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะฟะพะปัƒั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚ะธ ะทะฐ %s"
@@ -1914,87 +1941,87 @@ msgstr "ะ’ ะฐั€ั…ะธะฒะฐ ะฝัะผะฐ ะฟะพะปะต โ€žcontrolโ€œ"
 msgid "Unable to get a cursor"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟะพะปัƒั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะบัƒั€ัะพั€"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: ะะตัƒัะฟะตั… ะฟั€ะธ ั‡ะตั‚ะตะฝะตั‚ะพ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธั %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: ะะตัƒัะฟะตั… ะฟั€ะธ ั‡ะตั‚ะตะฝะตั‚ะพ ะฝะฐ %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: ะ“ั€ะตัˆะบะธั‚ะต ัะต ะพั‚ะฝะฐััั‚ ะทะฐ ั„ะฐะนะปะฐ "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟั€ะตะฒั€ัŠั‰ะฐะฝะตั‚ะพ ะฝะฐ %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพะฑั…ะพะดะฐ ะฝะฐ ะดัŠั€ะฒะพั‚ะพ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟั€ะพั‡ะธั‚ะฐะฝะตั‚ะพ ะฝะฐ ะฒั€ัŠะทะบะฐ %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟั€ะตะผะฐั…ะฒะฐะฝะตั‚ะพ ะฝะฐ ะฒั€ัŠะทะบะฐ %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ะะตัƒัะฟะตั… ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฒั€ัŠะทะบะฐ %s ะบัŠะผ %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "ะŸั€ะตะฒะธัˆะตะฝ ะปะธะผะธั‚ ะฝะฐ DeLink ะพั‚ %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ะั€ั…ะธะฒัŠั‚ ะฝัะผะฐ ะฟะพะปะต โ€žpackageโ€œ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ะฝัะผะฐ ะทะฐะฟะธั โ€žoverrideโ€œ\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ะฟะพะดะดัŠั€ะถะฐั‰ะธั ะฟะฐะบะตั‚ะฐ %s ะต %s, ะฐ ะฝะต %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ะฝัะผะฐ ะทะฐะฟะธั โ€žsource overrideโ€œ\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ะฝัะผะฐ ััŠั‰ะพ ะธ ะทะฐะฟะธั โ€žbinary overrideโ€œ\n"
@@ -2068,7 +2095,7 @@ msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ั‡ะตั‚ะตะฝะต ะดะพะบะฐั‚ะพ ัะต ะธะทั‡ะธัะปัะฒะฐ
 msgid "Problem unlinking %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟั€ะตะผะฐั…ะฒะฐะฝะตั‚ะพ ะฝะฐ ะฒั€ัŠะทะบะฐ ะฝะฐ %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะตั‚ะพ ะฝะฐ %s ะฝะฐ %s"
@@ -2126,23 +2153,23 @@ msgstr ""
 "  -o=? ะะฐัั‚ั€ะพะนะฒะฐะฝะต ะฝะฐ ะฟั€ะพะธะทะฒะพะปะฝะฐ ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะพะฝะฝะฐ ะพะฟั†ะธั, ั‚.ะต. -o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะพะณั€ะฐะผะฝะธ ะบะฐะฝะฐะปะธ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ ะฝะฐ gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ะ ะฐะทะฒะฐะปะตะฝ ะฐั€ั…ะธะฒ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ะะตะฒัั€ะฝะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ ะฝะฐ tar, ั€ะฐะทะฒะฐะปะตะฝ ะฐั€ั…ะธะฒ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ะะตะฟะพะทะฝะฐั‚ะฐ ะทะฐะณะปะฐะฒะฝะฐ ั‡ะฐัั‚ ะฝะฐ TAR ั‚ะธะฟ %u, ะตะปะตะผะตะฝั‚ %s"
@@ -2213,54 +2240,54 @@ msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะทะฐะฟะธั ะฝะฐ ั„ะฐะนะป %s"
 msgid "Failed to close file %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะป %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ะŸัŠั‚ัั‚ %s ะต ั‚ะฒัŠั€ะดะต ะดัŠะปัŠะณ"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "ะ ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ %s ะฟะพะฒะตั‡ะต ะพั‚ ะฒะตะดะฝัŠะถ"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ %s ะต ะพั‚ะบะปะพะฝะตะฝะฐ"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ะŸะฐะบะตั‚ัŠั‚ ัะต ะพะฟะธั‚ะฒะฐ ะดะฐ ะฟะธัˆะต ะฒ ั†ะตะปั‚ะฐ ะทะฐ ะพั‚ะบะปะพะฝะตะฝะธะต %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "ะŸัŠั‚ัั‚ ะทะฐ ะพั‚ะบะปะพะฝะตะฝะธะต ะต ั‚ะฒัŠั€ะดะต ะดัŠะปัŠะณ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ %s ัะต ะทะฐะผะตะฝั ั ะฝะต-ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฒัŠะทะตะป ะฒ ะฝะตะณะพะฒะธั ั…ะตัˆ"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ะŸัŠั‚ัั‚ ะต ั‚ะฒัŠั€ะดะต ะดัŠะปัŠะณ"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "ะคะฐะนะปะพะฒะตั‚ะต ัะต ะทะฐะผะตะฝัั‚ ััŠั ััŠะดัŠั€ะถะฐะฝะธะตั‚ะพ ะฝะฐ ะฟะฐะบะตั‚ะฐ %s ะฑะตะท ะฒะตั€ัะธั"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ะคะฐะนะป %s/%s ะทะฐะผะตะฝั ั‚ะพะทะธ ะฒ ะฟะฐะบะตั‚ %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟะพะปัƒั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚ะธ ะทะฐ %s"
@@ -2342,30 +2369,30 @@ msgstr ""
 "ะทะฐะฑั€ะฐะฝะตะฝะพ ะพั‚ ะฟะพั‚ั€ะตะฑะธั‚ะตะปั."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liะด %liั‡ %liะผ %liั"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liั‡ %liะผ %liั"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liะผ %liั"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%liั"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "ะ˜ะทะฑะพั€ัŠั‚ %s ะฝะต ะต ะฝะฐะผะตั€ะตะฝ"
@@ -2438,6 +2465,16 @@ msgstr "%c%s... ะ“ั€ะตัˆะบะฐ!"
 msgid "%c%s... Done"
 msgstr "%c%s... ะ“ะพั‚ะพะฒะพ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ะ“ะพั‚ะพะฒะพ"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2498,118 +2535,124 @@ msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚ะธั‚ะต ะฝะ
 msgid "Problem closing the gzip file %s"
 msgstr "ะŸั€ะพะฑะปะตะผ ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะต ะฝะฐ ะบะพะผะฟั€ะตัะธั€ะฐะฝะธัั‚ ั„ะฐะนะป %s (gzip)"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "ะะต ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะต ะทะฐ ั„ะฐะนะป ะทะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะต %s, ะบะพะนั‚ะพ ะต ัะฐะผะพ ะทะฐ ั‡ะตั‚ะตะฝะต"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะป ะทะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะต %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ะะต ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะต ะทะฐ ั„ะฐะนะป ะทะฐ ะทะฐะบะปัŽั‡ะฒะฐะฝะต %s, ะบะพะนั‚ะพ ะต ะผะพะฝั‚ะธั€ะฐะฝ ะฟะพ NFS"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะดะพัั‚ัŠะฟะฐ ะดะพ ะทะฐะบะปัŽั‡ะฒะฐะฝะต %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ััŠะทะดะฐะดะต ัะฟะธััŠะบ ะพั‚ ั„ะฐะนะปะพะฒะต, ะทะฐั‰ะพั‚ะพ โ€ž%sโ€œ ะฝะต ะต ะดะธั€ะตะบั‚ะพั€ะธั"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "ะŸั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ, ะฟะพะฝะตะถะต ะฝะต ะต ะพะฑะธะบะฝะพะฒะตะฝ ั„ะฐะนะป"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "ะŸั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ, ะฟะพะฝะตะถะต ะฝัะผะฐ ั€ะฐะทัˆะธั€ะตะฝะธะต"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "ะŸั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ ะฒ ะดะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ, ะฟะพะฝะตะถะต ั€ะฐะทัˆะธั€ะตะฝะธะตั‚ะพ ะผัƒ ะต ะณั€ะตัˆะฝะพ"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ะะฐั€ัƒัˆะตะฝะธะต ะฝะฐ ะทะฐั‰ะธั‚ะฐั‚ะฐ ะฝะฐ ะฟะฐะผะตั‚ั‚ะฐ (segmentation fault) ะฒ ะฟะพะดะฟั€ะพั†ะตัะฐ %s."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ะŸะพะด-ะฟั€ะพั†ะตััŠั‚ %s ะฟะพะปัƒั‡ะธ ัะธะณะฝะฐะป %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ะŸะพะดะฟั€ะพั†ะตััŠั‚ %s ะฒัŠั€ะฝะฐ ะบะพะด ะทะฐ ะณั€ะตัˆะบะฐ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ะŸะพะดะฟั€ะพั†ะตััŠั‚ %s ะทะฐะฒัŠั€ัˆะธ ะฝะตะพั‡ะฐะบะฒะฐะฝะพ"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะปะพะฒ ะผะฐะฝะธะฟัƒะปะฐั‚ะพั€ %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ััŠะทะดะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฟะพะดะฟั€ะพั†ะตั IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะธะทะฟัŠะปะฝะตะฝะธะตั‚ะพ ะฝะฐ ะบะพะผะฟั€ะตัะธั€ะฐั‰ะฐั‚ะฐ ะฟั€ะพะณั€ะฐะผะฐ "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 "ะณั€ะตัˆะบะฐ ะฟั€ะธ ั‡ะตั‚ะตะฝะต, ะฒัะต ะพั‰ะต ะธะผะฐ %llu ะทะฐ ั‡ะตั‚ะตะฝะต, ะฝะพ ะฝัะผะฐ ะฝะธั‚ะพ ะตะดะธะฝ ะพัั‚ะฐะฝะฐะป"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะธั, ะฒัะต ะพั‰ะต ะธะผะต %llu ะทะฐ ะทะฐะฟะธั, ะฝะพ ะฝะต ัƒัะฟั"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ะŸั€ะพะฑะปะตะผ ะฟั€ะธ ะทะฐั‚ะฒะฐั€ัะฝะต ะฝะฐ ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ะŸั€ะพะฑะปะตะผ ะฟั€ะธ ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ %s ะฝะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ะŸั€ะพะฑะปะตะผ ะฟั€ะธ ะธะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ะŸั€ะพะฑะปะตะผ ะฟั€ะธ ัะธะฝั…ั€ะพะฝะธะทะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะปะฐ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ะ’ %s ะฝัะผะฐ ะธะฝัั‚ะฐะปะธั€ะฐะฝ ะบะปัŽั‡ะพะดัŠั€ะถะฐั‚ะตะป."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ะŸั€ะฐะทะตะฝ ะบะตัˆ ะฝะฐ ะฟะฐะบะตั‚ะธ"
@@ -2635,59 +2678,59 @@ msgstr "ะขะฐะทะธ ะฒะตั€ัะธั ะฝะฐ APT ะฝะต ะฟะพะดะดัŠั€ะถะฐ ัะธัั‚ะตะผะฐ ะทะฐ
 msgid "The package cache was built for a different architecture"
 msgstr "ะšะตัˆัŠั‚ ะฝะฐ ะฟะฐะบะตั‚ะธ ะต ะฑะธะป ะฝะฐะฟั€ะฐะฒะตะฝ ะทะฐ ั€ะฐะทะปะธั‡ะฝะฐ ะฐั€ั…ะธั‚ะตะบั‚ัƒั€ะฐ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ะ—ะฐะฒะธัะธ ะพั‚"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "ะŸั€ะตะดะฒะฐั€ะธั‚ะตะปะฝะพ ะทะฐะฒะธัะธ ะพั‚"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ะŸั€ะตะดะปะฐะณะฐ ัะต"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ะŸั€ะตะฟะพั€ัŠั‡ะฒะฐ ัะต"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "ะ’ ะบะพะฝั„ะปะธะบั‚ ั"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ะ—ะฐะผะตะฝั"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ะ˜ะทะฒะฐะถะดะฐ ะพั‚ ัƒะฟะพั‚ั€ะตะฑะฐ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ะงัƒะฟะธ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "ะŸะพะดะพะฑั€ัะฒะฐ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "ะฒะฐะถะตะฝ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ะธะทะธัะบะฒะฐะฝ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ัั‚ะฐะฝะดะฐั€ั‚ะตะฝ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ะฝะตะทะฐะดัŠะปะถะธั‚ะตะปะตะฝ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ะดะพะฟัŠะปะฝะธั‚ะตะปะตะฝ"
 
@@ -2794,17 +2837,17 @@ msgstr "ะžั‚ะฒะฐั€ัะฝะต ะฝะฐ %s"
 msgid "Line %u too long in source list %s."
 msgstr "ะ ะตะด %u ะฒ ัะฟะธััŠะบะฐ ั ะธะทั‚ะพั‡ะฝะธั†ะธ %s ะต ั‚ะฒัŠั€ะดะต ะดัŠะปัŠะณ."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ะ›ะพัˆะพ ั„ะพั€ะผะฐั‚ะธั€ะฐะฝ ั€ะตะด %u ะฒ ัะฟะธััŠะบะฐ ั ะธะทั‚ะพั‡ะฝะธั†ะธ %s (ั‚ะธะฟ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ะขะธะฟัŠั‚ โ€ž%sโ€œ ะฝะฐ ั€ะตะด %u ะฒ ัะฟะธััŠะบะฐ ั ะธะทั‚ะพั‡ะฝะธั†ะธ %s ะต ะฝะตะธะทะฒะตัั‚ะตะฝ."
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2813,12 +2856,12 @@ msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะตะทะฐะฑะฐะฒะฝะฐั‚ะฐ ะฝะฐัั‚ั€ะพะนะบะฐ ะฝะฐ โ€ž%sโ€œ. ะ—ะฐ ะฟะพะฒะตั‡ะต ะธะฝั„ะพั€ะผะฐั†ะธั ะฒะธะถั‚ะต "
 "ะธะฝั„ะพั€ะผะฐั†ะธัั‚ะฐ ะทะฐ APT::Immediate-Configure ะฒ โ€žman 5 apt.confโ€œ. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะบะพะฝั„ะธะณัƒั€ะธั€ะฐะฝะต ะฝะฐ โ€ž%sโ€œ. "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2843,7 +2886,7 @@ msgstr ""
 "ะŸะฐะบะตั‚ัŠั‚ %s ั‚ั€ัะฑะฒะฐ ะดะฐ ะฑัŠะดะต ะฟั€ะตะธะฝัั‚ะฐะปะธั€ะฐะฝ, ะฝะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฝะฐะผะตั€ะธ ะฐั€ั…ะธะฒ ะทะฐ "
 "ะฝะตะณะพ."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2851,12 +2894,12 @@ msgstr ""
 "ะ“ั€ะตัˆะบะฐ, pkgProblemResolver::Resolve ะณะตะฝะตั€ะธั€ะฐ ะฟะพะฒั€ะตะดะธ, ั‚ะพะฒะฐ ะผะพะถะต ะดะฐ ะต "
 "ะฟั€ะธั‡ะธะฝะตะฝะพ ะพั‚ ะทะฐะดัŠั€ะถะฐะฝะธ ะฟะฐะบะตั‚ะธ."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะบะพั€ะธะณะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะฟั€ะพะฑะปะตะผะธั‚ะต, ะธะผะฐั‚ะต ะทะฐะดัŠั€ะถะฐะฝะธ ัั‡ัƒะฟะตะฝะธ ะฟะฐะบะตั‚ะธ."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2864,7 +2907,7 @@ msgstr ""
 "ะัะบะพะธ ะธะฝะดะตะบัะฝะธ ั„ะฐะนะปะพะฒะต ะฝะต ะผะพะถะฐั…ะฐ ะดะฐ ะฑัŠะดะฐั‚ ะธะทั‚ะตะณะปะตะฝะธ. ะขะต ัะฐ ะฟั€ะตะฝะตะฑั€ะตะณะฝะฐั‚ะธ ะธะปะธ "
 "ัะฐ ะธะทะฟะพะปะทะฒะฐะฝะธ ะฟะพ-ัั‚ะฐั€ะธ."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ ััŠั ัะฟะธััŠั†ะธ %spartial ะปะธะฟัะฒะฐ."
@@ -2901,17 +2944,17 @@ msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ะดั€ะฐะนะฒะตั€ ะทะฐ ะผะต
 msgid "Method %s did not start correctly"
 msgstr "ะœะตั‚ะพะดัŠั‚ %s ะฝะต ัั‚ะฐั€ั‚ะธั€ะฐ ะฟั€ะฐะฒะธะปะฝะพ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ะกะปะพะถะตั‚ะต ะดะธัะบะฐ, ะพะทะฐะณะปะฐะฒะตะฝ โ€ž%sโ€œ ะฒ ัƒัั‚ั€ะพะนัั‚ะฒะพ โ€ž%sโ€œ ะธ ะฝะฐั‚ะธัะฝะตั‚ะต โ€žEnterโ€œ."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ะŸะฐะบะตั‚ะฝะฐั‚ะฐ ัะธัั‚ะตะผะฐ โ€ž%sโ€œ ะฝะต ะต ะฟะพะดะดัŠั€ะถะฐะฝะฐ"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพะฟั€ะตะดะตะปัะฝะตั‚ะพ ะฝะฐ ะฟะพะดั…ะพะดัั‰ะฐ ะฟะฐะบะตั‚ะฝะฐ ัะธัั‚ะตะผะฐ"
 
@@ -2969,14 +3012,14 @@ msgstr "ะšะตัˆัŠั‚ ะธะผะฐ ะฝะตััŠะฒะผะตัั‚ะธะผะฐ ัะธัั‚ะตะผะฐ ะทะฐ ะฒะตั€ัะ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ะ’ัŠะทะฝะธะบะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐั‚ะฐ ะฝะฐ %s (%s%d)"
@@ -3001,27 +3044,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "ะ•ั…ะฐ, ะฝะฐะดั…ะฒัŠั€ะปะธั…ั‚ะต ะฑั€ะพั ะทะฐะฒะธัะธะผะพัั‚ะธ, ะฝะฐ ะบะพะนั‚ะพ ะต ัะฟะพัะพะฑะฝะฐ ั‚ะฐะทะธ ะฒะตั€ัะธั ะฝะฐ APT."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ะŸะฐะบะตั‚ัŠั‚ %s %s ะฝะต ะฑะตัˆะต ะพั‚ะบั€ะธั‚ ะฟั€ะธ ะพะฑั€ะฐะฑะพั‚ะบะฐั‚ะฐ ะฝะฐ ั„ะฐะนะปะฐ ััŠั ะทะฐะฒะธัะธะผะพัั‚ะธ"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะฟะพะปัƒั‡ะฐะฒะฐะฝะตั‚ะพ ะฝะฐ ะฐั‚ั€ะธะฑัƒั‚ะธ ะฝะฐ ัะฟะธััŠะบะฐ ั ะฟะฐะบะตั‚ะธ ั ะธะทั…ะพะดะตะฝ ะบะพะด %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ะงะตั‚ะตะฝะต ะฝะฐ ัะฟะธััŠั†ะธั‚ะต ั ะฟะฐะบะตั‚ะธ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ะกัŠะฑะธั€ะฐะฝะต ะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ โ€žะžัะธะณัƒั€ัะฒะฐโ€œ"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ะ’ั…ะพะดะฝะพ/ะธะทั…ะพะดะฝะฐ ะณั€ะตัˆะบะฐ ะฟั€ะธ ะทะฐะฟะฐะทะฒะฐะฝะตั‚ะพ ะฝะฐ ะบะตัˆะฐ ะฝะฐ ะฟะฐะบะตั‚ะธ ั ะธะทั…ะพะดะตะฝ ะบะพะด"
 
@@ -3034,12 +3077,12 @@ msgstr "ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะตั‚ะพ ัะต ะฟั€ะพะฒะฐะปะธ, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "ะะตััŠะพั‚ะฒะตั‚ัั‚ะฒะธะต ะฝะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ MD5"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "ะะตััŠะพั‚ะฒะตั‚ัั‚ะฒะธะต ะฝะฐ ะบะพะฝั‚ั€ะพะปะฝะฐั‚ะฐ ััƒะผะฐ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3048,16 +3091,16 @@ msgstr ""
 "ะะต ะผะพะถะต ะดะฐ ัะต ะพั‚ะบั€ะธะต ะตะปะตะผะตะฝั‚ โ€ž%sโ€œ ะฒัŠะฒ ั„ะฐะนะปะฐ Release (ะพะฑัŠั€ะบะฐะฝ ั€ะตะด ะฒ sources."
 "list ะธะปะธ ะฟะพะฒั€ะตะดะตะฝ ั„ะฐะนะป)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ะะต ะต ะพั‚ะบั€ะธั‚ะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ ะทะฐ โ€ž%sโ€œ  ะฒัŠะฒ ั„ะฐะนะปะฐ Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ะัะผะฐ ะฝะฐะปะธั‡ะฝะธ ะฟัƒะฑะปะธั‡ะฝะธ ะบะปัŽั‡ะพะฒะต ะทะฐ ัะปะตะดะฝะธั‚ะต ะธะดะตะฝั‚ะธั„ะธะบะฐั‚ะพั€ะธ ะฝะฐ ะบะปัŽั‡ะพะฒะต:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3066,27 +3109,27 @@ msgstr ""
 "ะคะฐะนะปัŠั‚ ััŠั ัะปัƒะถะตะฑะฝะฐ ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ โ€ž%sโ€œ ะต ะพัั‚ะฐั€ัะป (ะฒะฐะปะธะดะตะฝ ะดะพ %s). ะัะผะฐ ะดะฐ ัะต "
 "ะฟั€ะธะปะฐะณะฐั‚ ะพะฑะฝะพะฒัะฒะฐะฝะธั ะพั‚ ั‚ะพะฒะฐ ั…ั€ะฐะฝะธะปะธั‰ะต."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ะšะพะฝั„ะปะธะบั‚ ะฒ ะดะธัั‚ั€ะธะฑัƒั†ะธัั‚ะฐ: %s (ะพั‡ะฐะบะฒะฐะฝะฐ: %s, ะฝะฐะผะตั€ะตะฝะฐ: %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ั†ะธั„ั€ะพะฒะธั ะฟะพะดะฟะธั. ะฅั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฝะต ะต ะพะฑะฝะพะฒะตะฝะพ ะธ ั‰ะต ัะต "
 "ะธะทะฟะพะปะทะฒะฐั‚ ัั‚ะฐั€ะธั‚ะต ะธะฝะดะตะบัะฝะธ ั„ะฐะนะปะพะฒะต. ะ“ั€ะตัˆะบะฐ ะพั‚ GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ะ“ั€ะตัˆะบะฐ ะพั‚ GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3095,7 +3138,7 @@ msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะป ะทะฐ ะฟะฐะบะตั‚ %s. ะขะพะฒะฐ ะผะพะถะต ะดะฐ ะพะทะฝะฐั‡ะฐะฒะฐ, ั‡ะต ั‚ั€ัะฑะฒะฐ "
 "ั€ัŠั‡ะฝะพ ะดะฐ ะพะฟั€ะฐะฒะธั‚ะต ั‚ะพะทะธ ะฟะฐะบะตั‚ (ะฟะพั€ะฐะดะธ ะฟั€ะพะฟัƒัะฝะฐั‚ะฐ ะฐั€ั…ะธั‚ะตะบั‚ัƒั€ะฐ)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3104,38 +3147,38 @@ msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ ั„ะฐะนะป ะทะฐ ะฟะฐะบะตั‚ %s. ะขะพะฒะฐ ะผะพะถะต ะดะฐ ะพะทะฝะฐั‡ะฐะฒะฐ, ั‡ะต ั‚ั€ัะฑะฒะฐ "
 "ั€ัŠั‡ะฝะพ ะดะฐ ะพะฟั€ะฐะฒะธั‚ะต ั‚ะพะทะธ ะฟะฐะบะตั‚."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ะ˜ะฝะดะตะบัะฝะธั‚ะต ั„ะฐะนะปะพะฒะต ะฝะฐ ะฟะฐะบะตั‚ะฐ ัะฐ ะฟะพะฒั€ะตะดะตะฝะธ. ะัะผะฐ ะฟะพะปะต Filename: ะทะฐ ะฟะฐะบะตั‚ %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ะะตััŠะพั‚ะฒะตั‚ัั‚ะฒะธะต ะฝะฐ ั€ะฐะทะผะตั€ะฐ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะฐะฝะฐะปะธะทะธั€ะฐะฝะต ะฝะฐ ั„ะฐะนะป Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "ะ’ัŠะฒ ั„ะฐะนะปะฐ Release %s ะปะธะฟัะฒะฐั‚ ั€ะฐะทะดะตะปะธ"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "ะ’ัŠะฒ ั„ะฐะนะปะฐ Release %s ะปะธะฟัะฒะฐ ะบะพะฝั‚ั€ะพะปะฝะฐ ััƒะผะฐ"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะนะฝะพัั‚ ะทะฐ โ€žValid-Untilโ€œ ะฒัŠะฒ ั„ะฐะนะปะฐ Release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปะฝะฐ ัั‚ะพะธฬ†ะฝะพัั‚ ะทะฐ โ€žDateโ€œ ะฒัŠะฒ ั„ะฐะธฬ†ะปะฐ Release %s"
@@ -3163,7 +3206,7 @@ msgstr "ะ˜ะดะตะฝั‚ะธั„ะธั†ะธั€ะฐะฝะต..."
 msgid "Stored label: %s\n"
 msgstr "ะ—ะฐะฟะฐะทะตะฝ ะตั‚ะธะบะตั‚: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ะ”ะตะผะพะฝั‚ะธั€ะฐะฝะต ะฝะฐ CD-ROM...\n"
 
@@ -3227,30 +3270,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ะšะพะฟะธั€ะฐะฝะต ะฝะฐ ัะฟะธััŠั†ะธั‚ะต ั ะฟะฐะบะตั‚ะธ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ะ—ะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฝะพะฒะธั ัะฟะธััŠะบ ั ะธะทั‚ะพั‡ะฝะธั†ะธ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ะ—ะฐะฟะธัะธั‚ะต ะฒ ัะฟะธััŠะบะฐ ั ะธะทั‚ะพั‡ะฝะธั†ะธ ะทะฐ ั‚ะพะทะธ ะดะธัะบ ัะฐ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะธ ัะฐ %i ะทะฐะฟะธัะฐ.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะธ ัะฐ %i ะทะฐะฟะธัะฐ ั %i ะปะธะฟัะฒะฐั‰ะธ ั„ะฐะนะปะฐ.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะธ ัะฐ %i ะทะฐะฟะธัะฐ ั %i ะฝะตััŠะพั‚ะฒะตั‚ัั‚ะฒะฐั‰ะธ ั„ะฐะนะปะฐ\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะธ ัะฐ %i ะทะฐะฟะธัะฐ ั %i ะปะธะฟัะฒะฐั‰ะธ ะธ %i ะฝะตััŠะพั‚ะฒะตั‚ัั‚ะฒะฐั‰ะธ ั„ะฐะนะปะฐ\n"
@@ -3265,17 +3308,6 @@ msgstr "ะะต ะต ะฝะฐะผะตั€ะตะฝ oั‚ะพั€ะธะทะฐั†ะธะพะฝะตะฝ ะทะฐะฟะธั ะทะฐ: %s"
 msgid "Hash mismatch for: %s"
 msgstr "ะะตััŠะพั‚ะฒะตั‚ัั‚ะฒะธะต ะฝะฐ ะบะพะฝั‚ั€ะพะปะฝะฐั‚ะฐ ััƒะผะฐ ะทะฐ: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "ะคะฐะนะปัŠั‚ %s ะฝะต ะทะฐะฟะพั‡ะฒะฐ ั ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฟะพะดะฟะธัะฒะฐะฝะต ะฒ ะพะฑะธะบะฝะพะฒะตะฝ ั‚ะตะบัั‚."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ะ’ %s ะฝัะผะฐ ะธะฝัั‚ะฐะปะธั€ะฐะฝ ะบะปัŽั‡ะพะดัŠั€ะถะฐั‚ะตะป."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3349,117 +3381,117 @@ msgstr ""
 "ะ’ัŠะฝัˆะฝะฐั‚ะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ัƒะดะพะฒะปะตั‚ะฒะพั€ัะฒะฐะฝะต ะฝะฐ ะทะฐะฒะธัะธะผะพัั‚ะธ ัะต ะฟั€ะพะฒะฐะปะธ ะฑะตะท ะดะฐ ะธะทะฒะตะดะต "
 "ััŠะพะฑั‰ะตะฝะธะต ะทะฐ ะณั€ะตัˆะบะฐ"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "ะ˜ะทะฟัŠะปะฝัะฒะฐะฝะต ะฝะฐ ะฒัŠะฝัˆะฝะฐ ะฟั€ะพะณั€ะฐะผะฐ ะทะฐ ัƒะดะพะฒะปะตั‚ะฒะพั€ัะฒะฐะฝะต ะฝะฐ ะทะฐะฒะธัะธะผะพัั‚ะธ"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ะ˜ะฝัั‚ะฐะปะธั€ะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ะšะพะฝั„ะธะณัƒั€ะธั€ะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "ะžะบะพะฝั‡ะฐั‚ะตะปะฝะพ ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "ะžั‚ะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ะธะทั‡ะตะทะฒะฐะฝะตั‚ะพ ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ะ˜ะทะฟัŠะปะฝะตะฝะธะต ะฝะฐ ั‚ั€ะธะณะตั€ ัะปะตะด ะธะฝัั‚ะฐะปะธั€ะฐะฝะต %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ะธัั‚ะฐ โ€ž%sโ€œ ะปะธะฟัะฒะฐ"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ะะตัƒัะฟะตั… ะฟั€ะธ ะพั‚ะฒะฐั€ัะฝะต ะฝะฐ ั„ะฐะนะปะฐ โ€ž%sโ€œ"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ะŸะพะดะณะพั‚ะฒัะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ะ ะฐะทะฟะฐะบะตั‚ะธั€ะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ะŸะพะดะณะพั‚ะฒัะฝะต ะฝะฐ %s ะทะฐ ะบะพะฝั„ะธะณัƒั€ะธั€ะฐะฝะต"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s ะต ะธะฝัั‚ะฐะปะธั€ะฐะฝ"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ะŸะพะดะณะพั‚ะฒัะฝะต ะทะฐ ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s ะต ะฟั€ะตะผะฐั…ะฝะฐั‚"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ะŸะพะดะณะพั‚ะพะฒะบะฐ ะทะฐ ะฟัŠะปะฝะพ ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s ะต ะฝะฐะฟัŠะปะฝะพ ะฟั€ะตะผะฐั…ะฝะฐั‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ะะตัƒัะฟะตั… ะฟั€ะธ ะทะฐะฟะธั ะฒ ะถัƒั€ะฝะฐะปะฐ, openpty() ัะต ะฟั€ะพะฒะฐะปะธ (ะดะฐะปะธ /dev/pts ะต "
 "ะผะพะฝั‚ะธั€ะฐะฝะฐ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "ะ˜ะทะฟัŠะปะฝัะฒะฐะฝะต ะฝะฐ dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "ะžะฟะตั€ะฐั†ะธัั‚ะฐ ะต ะฟั€ะตะบัŠัะฝะฐั‚ะฐ"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "ะŸะพั€ะฐะดะธ ะดะพัั‚ะธะณะฐะฝะต ะฝะฐ ะผะฐะบัะธะผะฐะปะฝะธั ะฑั€ะพะน ะดะพะบะปะฐะดะธ (MaxReports) ะฝะต ะต ะทะฐะฟะธัะฐะฝ ะฝะพะฒ "
 "ะดะพะบะปะฐะด ะทะฐ ะทะฐะฒะธัะธะผะพัั‚ะธั‚ะต."
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "ะพั‚ะปะฐะณะฐะฝะต ะฝะฐ ะฝะฐัั‚ั€ะพะนะบะฐั‚ะฐ ะฟะพั€ะฐะดะธ ะฝะตัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะธ ะทะฐะฒะธัะธะผะพัั‚ะธ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3467,7 +3499,7 @@ msgstr ""
 "ะ”ะพะบะปะฐะด ะทะฐ ะทะฐะฒะธัะธะผะพัั‚ะธั‚ะต ะฝะต ะต ะทะฐะฟะธัะฐะฝ ะทะฐั‰ะพั‚ะพ ััŠะพะฑั‰ะตะฝะธะตั‚ะพ ะทะฐ ะณั€ะตัˆะบะฐ ะต ะฟะพั€ะพะดะตะฝะพ "
 "ะพั‚ ะดั€ัƒะณะฐ ะณั€ะตัˆะบะฐ."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3483,13 +3515,7 @@ msgstr ""
 "ะ”ะพะบะปะฐะด ะทะฐ ะทะฐะฒะธัะธะผะพัั‚ะธั‚ะต ะฝะต ะต ะทะฐะฟะธัะฐะฝ ะทะฐั‰ะพั‚ะพ ะณั€ะตัˆะบะฐั‚ะฐ ะต ะฟั€ะธั‡ะธะฝะตะฝะฐ ะพั‚ "
 "ะฝะตะดะพัั‚ะฐั‚ัŠั‡ะฝะฐ ะพะฟะตั€ะฐั‚ะธะฒะฝะฐ ะฟะฐะผะตั‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3525,20 +3551,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "ะ‘ะตะท ะทะฐะบะปัŽั‡ะฒะฐะฝะต"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "ะะตั‰ะพ ะปะพัˆะพ ัะต ัะปัƒั‡ะธ ะฟั€ะธ ะฝะฐะผะธั€ะฐะฝะตั‚ะพ ะฝะฐ IP ะฐะดั€ะตัะฐ ะฝะฐ โ€ž%s:%sโ€œ (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ะ“ะพั‚ะพะฒะพ"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "ะ“ั€ะตัˆะบะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะฐ ะฝะฐ ั†ะธั„ั€ะพะฒะธั ะฟะพะดะฟะธั. ะฅั€ะฐะฝะธะปะธั‰ะตั‚ะพ ะฝะต ะต ะพะฑะฝะพะฒะตะฝะพ ะธ ั‰ะต ัะต "
-#~ "ะธะทะฟะพะปะทะฒะฐั‚ ัั‚ะฐั€ะธั‚ะต ะธะฝะดะตะบัะฝะธ ั„ะฐะนะปะพะฒะต. ะ“ั€ะตัˆะบะฐ ะพั‚ GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "ะคะฐะนะปัŠั‚ %s ะฝะต ะทะฐะฟะพั‡ะฒะฐ ั ะธะฝั„ะพั€ะผะฐั†ะธั ะทะฐ ะฟะพะดะฟะธัะฒะฐะฝะต ะฒ ะพะฑะธะบะฝะพะฒะตะฝ ั‚ะตะบัั‚."
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ะŸั€ะพะฟัƒัะบะฐะฝะต ะฝะฐ ะฝะตััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ ั„ะฐะนะป %s"
diff --git a/po/bs.po b/po/bs.po
index 84d6787be..4f0beca48 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir ล eฤ‡eroviฤ‡ <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -73,95 +73,95 @@ msgstr "Ukupno Verzija/Datoteka odnosa:"
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "Ukupno โ€žobezbeฤ‘ujeโ€œ mapiranja: "
+msgstr ""
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "Ukupno globiranih znakovnih nizova: "
+msgstr ""
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "Ukupan prostor verzija zavisnosti: "
+msgstr ""
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Ukupan nepopunjen prostor: "
+msgstr ""
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "Ukupno uraฤunatog prostora: "
+msgstr ""
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "Paketski fajl %s nije sinhronizovan."
+msgstr ""
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Paketi nisu pronaฤ‘eni"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
-msgstr "Morate dati bar jedan uzorak za pretraลพivanje"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Ova komanda je zastarjela. Umjesto nje koristite 'apt-mark showauto'."
+msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaฤ‡i paket %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Keลก nije sinhronizovan, ne mogu unakrsno povezati paketski fajl"
+msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
-msgstr "Fiksirani paketi:"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
-msgstr "(nije naฤ‘eno)"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
-msgstr "  Kandidat: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
-msgstr "Ni jedan(nema)"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
-msgstr "  Fiksacija paketa: "
+msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
-msgstr "  Tabela verzija:"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s za %s kompajlirano na %s %s\n"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -197,56 +197,31 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"Usage: apt-cache [opcije] naredba\n"
-"       apt-cache [opcije] showpkg pak1 [pak2 ...]\n"
-"       apt-cache [opcije] showsrc pak1 [pak2 ...]\n"
-"\n"
-"apt-cache alat niskog nivoa za ฤitanje informacija\n"
-"iz APT priruฤnog spremiลกta binarnih datoteka\n"
-"\n"
-"Komande:\n"
-"   gencaches - Sagradi spremiลกta binarnih i izvornih datoteka\n"
-"   showpkg - Prikaลพi oprลกte informacije za pojedinaฤni paket\n"
-"   showsrc - Prikaลพi izvorne zapise\n"
-"   stats - Prikaลพi osnovnu statistiku\n"
-"   dump - Prikaลพi cijelu datoteku detaljno\n"
-"   dumpavail - ล tampaj dostupnu datoteku na standarni izlaz\n"
-"   unmet - Prikaลพi nezadovoljene zavisnosti\n"
-"   search - Pretraลพi listu paketa za regex uzorak\n"
-"   show - Prikaลพi ฤitljiv zapis za paket\n"
-"   depends - Prikaลพi sirovu zavisnost za paket\n"
-"   rdepends - Prikaลพi informaciju o inverzonoj zavisnosti za paket\n"
-"   pkgnames - Prikaลพio imena svih paketa u sistemu\n"
-"   dotty - Generiลกi grafove paketa za GraphViz\n"
-"   xvcg - Generiลกi grafove paketa za xvcg\n"
-"   policy - Prikaลพi pravila\n"
-"\n"
-"opcije:\n"
-"  -h   Ovaj tekst pomoฤ‡i.\n"
-"  -p=? Priruฤno spremiลกte paketa.\n"
-"  -s=? Priruฤno spremiลกte izvora.\n"
-"  -q   Onemoguฤ‡i inikator napretka.\n"
-"  -i   Prikaลพi samo vaลพne zavisnosti za nezadovoljenu komandu.\n"
-"  -c=? Proฤitaj ovu koniguracionu datoteku\n"
-"  -o=? Postavi proizvoljnu konfiguracionu opciju, npr. -o dir::cache=/tmp\n"
-"Vidi apt-cache(8) i apt.conf(5) stranice uputstava za viลกe informacija.\n"
-
-#: cmdline/apt-cdrom.cc:79
+
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Molim vas dajte ime za ovaj Disk, kao ลกto je 'Debian 5.0.3 Disk 1'"
+msgstr ""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Molim, ubacite disk u ureฤ‘aj i pritisnite โ€žEnterโ€œ"
+msgstr ""
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Ponovite proces za ostale CD-ove u vaลกem setu"
+msgstr ""
 
 #: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
@@ -282,20 +257,20 @@ msgstr ""
 
 #: cmdline/apt-get.cc:135
 msgid "Y"
-msgstr "D"
+msgstr ""
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "Greลกka pri kompajliranju regularnog izraza - %s"
+msgstr ""
 
 #: cmdline/apt-get.cc:260
 msgid "The following packages have unmet dependencies:"
-msgstr "Sljedeฤ‡i paketi imaju nezadovoljenje meฤ‘uzavisnosti:"
+msgstr ""
 
 #: cmdline/apt-get.cc:350
 #, c-format
@@ -346,64 +321,62 @@ msgstr "Slijedeฤ‡i paketi ฤ‡e biti nadograฤ‘eni:"
 
 #: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
-msgstr "Sljedeฤ‡i paketi ฤ‡e biti VRAฤ†ENI NA STARU VERZIJU:"
+msgstr ""
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
-msgstr "Sljedeฤ‡i zadrลพani paketi ฤ‡e biti izmijenjeni:"
+msgstr ""
 
 #: cmdline/apt-get.cc:563
 #, c-format
 msgid "%s (due to %s) "
-msgstr "%s (zbog %s) "
+msgstr ""
 
 #: cmdline/apt-get.cc:571
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"UPOZORENJE: sljedeฤ‡i esencijalni paketi ฤ‡e biti uklonjeni.\n"
-"Ovo NE TREBA da se radi ukoliko ne znate taฤno ลกta radite!"
 
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aลพuriranih, %lu novoinstaliranih, "
+msgstr ""
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu ponovo instaliranih, "
+msgstr ""
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu vraฤ‡enih na prethodnu verziju, "
+msgstr ""
 
 #: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu za uklanjanje i %lu koji neฤ‡e biti aลพurirani.\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
-msgstr "%lu koji nisu potpuno instalirani ili uklonjeni.\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:635
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Primjedba, izabiranje '%s' za zadatak '%s'\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:640
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Primjedba, izabiranje '%s' za regularni izraz '%s'\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:657
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "Paket %s je virtuelni paket kojeg obezbeฤ‘uju:\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
@@ -416,7 +389,7 @@ msgstr "Verzije kandidata"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
-msgstr "Morate eksplicitno izabrati jedan za instalaciju."
+msgstr ""
 
 #: cmdline/apt-get.cc:682
 #, c-format
@@ -425,9 +398,6 @@ msgid ""
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"Paket %s nije dostupan ali ga zahtjeva drugi paket.\n"
-"Ovo znaฤi da paket ili nedostaje, ili je zastario,\n"
-"ili je dostupan samo iz nekog drugog izvora\n"
 
 #: cmdline/apt-get.cc:700
 msgid "However the following packages replace it:"
@@ -436,51 +406,50 @@ msgstr "Meฤ‘utim, slijedeฤ‡i paketi ga zamjenjuju:"
 #: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Paket '%s' nema instalacionog kandidata"
+msgstr ""
 
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtualni paketi kao '%s' ne mogu biti obrisani\n"
+msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
-"Paket '%s' nije instaliran, pa nije uklonjen. Da li ste mislili '%s'?\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Paket '%s' nije instaliran, pa nije uklonjen\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:788
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Napomena, izabrano '%s' umjesto '%s'\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:818
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Preskaฤem %s, poลกto je veฤ‡ instaliran a aลพuriranje nije zadato.\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:822
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Preskakanje %s, nije istalirano i potrebne su samo nadogradnje.\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:834
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ne mogu ponovo da instaliram %s poลกto ne moลพe biti skinut.\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:839
 #, c-format
 msgid "%s is already the newest version.\n"
-msgstr "%s je veฤ‡ u najnovijoj verziji.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
@@ -488,12 +457,12 @@ msgstr "ali se %s treba instalirati"
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Izabrana verzija '%s' (%s) za '%s'\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:889
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Izabrana verzija '%s' (%s) za '%s' zbog '%s'\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -501,7 +470,7 @@ msgstr "Ispravljam zavisnosti..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
-msgstr " nije uspelo."
+msgstr ""
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
@@ -509,7 +478,7 @@ msgstr "Ne mogu ispraviti zavisnosti"
 
 #: cmdline/apt-get.cc:1034
 msgid "Unable to minimize the upgrade set"
-msgstr "Nisam uspeo da minimizujem skup za aลพuriranje"
+msgstr ""
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
@@ -517,7 +486,7 @@ msgstr " Uraฤ‘eno"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Trebali biste pokrenuti 'apt-get -f install' da bi popravili ovo."
+msgstr ""
 
 #: cmdline/apt-get.cc:1043
 msgid "Unmet dependencies. Try using -f."
@@ -530,49 +499,49 @@ msgstr "Slijedeฤ‡i paketi ฤ‡e biti nadograฤ‘eni:"
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
-msgstr "Upozorenje o verifikaciji premoลกฤ‡eno.\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:1079
 msgid "Install these packages without verification [y/N]? "
-msgstr "ลฝelite li da instalirate ove pakete bez verifikacije [d/N]? "
+msgstr ""
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
-msgstr "Neki paketi nisu mogli biti verifikovani"
+msgstr ""
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
-msgstr "Postoje problemi a opcija -y je koriลกฤ‡ena bez opcije --force-yes"
+msgstr ""
 
 #: cmdline/apt-get.cc:1131
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Interna greลกka,  InstallPackages je pozvan sa neispravnim paketima!"
+msgstr ""
 
 #: cmdline/apt-get.cc:1140
 msgid "Packages need to be removed but remove is disabled."
-msgstr "Paketi treba da budu uklonjeni ali uklanjanje je onemoguฤ‡eno."
+msgstr ""
 
 #: cmdline/apt-get.cc:1151
 msgid "Internal error, Ordering didn't finish"
-msgstr "Interna greลกka, ยทOrdering nije zavrลกio"
+msgstr ""
 
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "ฤŒudno... veliฤine se razlikuju, obavijestite apt@packages.debian.org"
+msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Moram da dovuฤem %sB/%sB arhiva.\n"
+msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1201
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "Moram da dovuฤem %sB arhiva.\n"
+msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -580,29 +549,28 @@ msgstr "Moram da dovuฤem %sB arhiva.\n"
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
-"Nakon ove operacije %sB dodatnog prostora na disku ฤ‡e biti iskoriลกฤ‡eno.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Nakon ove operacije %sB prostora na disku ฤ‡e biti osloboฤ‘eno.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Ne mogu da odredim slobodan prostor na %s"
+msgstr ""
 
 #: cmdline/apt-get.cc:1241
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "Nemate dovoljno slobodnog prostora na %s."
+msgstr ""
 
 #: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279
 msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Specificirano โ€žSamo trivijalnoโ€œ ali ovo nije trivijalna operacija."
+msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
@@ -617,9 +585,6 @@ msgid ""
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"Krenuli ste da uradite neลกto ลกto moลพe potencijalno biti ลกtetno.\n"
-"Da biste nastavili, ukucajte frazu โ€ž%sโ€œ\n"
-" ?] "
 
 #: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288
 msgid "Abort."
@@ -630,34 +595,32 @@ msgstr "Odustani."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li ลพelite nastaviti? [Y/n]"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "Nisam uspeo da dovuฤem %s  %s\n"
+msgstr ""
 
 #: cmdline/apt-get.cc:1374
 msgid "Some files failed to download"
-msgstr "Neki fajlovi se nisu skinuli"
+msgstr ""
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
-msgstr "U โ€žsamo daunloudโ€œ modu sam, a daunloudovanje je zavrลกeno"
+msgstr ""
 
 #: cmdline/apt-get.cc:1381
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Nisam uspeo da skinem neke arhive, moลพda bi trebalo da izvrลกite โ€žapt-get "
-"updateโ€œ ili pokuลกate sa opcijom --fix-missing?"
 
 #: cmdline/apt-get.cc:1385
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing i zamjena medija nisu trenutno podrลพani"
+msgstr ""
 
 #: cmdline/apt-get.cc:1390
 msgid "Unable to correct missing packages."
-msgstr "Nisam mogao da ispravim nedostajuฤ‡e pakete."
+msgstr ""
 
 #: cmdline/apt-get.cc:1391
 msgid "Aborting install."
@@ -675,39 +638,37 @@ msgstr[1] ""
 
 #: cmdline/apt-get.cc:1423
 msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Napomena: Ovo je dpkg uradio automatski i namjenskui."
+msgstr ""
 
 #: cmdline/apt-get.cc:1561
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Zanemariti nedostupnu ciljanu verziju '%s' od paketa '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1593
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Izabiranje '%s' kao izvor paketa umjesto '%s'\n"
+msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1631
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Ignoriลกi nedostupnu verziju '%s' od paketa '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1647
 msgid "The update command takes no arguments"
-msgstr "Komanda โ€župdateโ€œ nema argumenata"
+msgstr ""
 
 #: cmdline/apt-get.cc:1713
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Ne bi trebalo da briลกemo stvari, ne mogu da pokrenem AutoRemover"
+msgstr ""
 
 #: cmdline/apt-get.cc:1817
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
-"Hm, izgleda da je AutoRemover uniลกtio neลกto ลกto stvarno nije smelo\n"
-"da se desi. Molim, zavidite izvjeลกtaj o greลกki za apt."
 
 #.
 #. if (Packages == 1)
@@ -719,13 +680,13 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
-msgstr "Sljedeฤ‡e informacije mogu pomoฤ‡i da se razrijeลกi situacija:"
+msgstr ""
 
 #: cmdline/apt-get.cc:1824
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Interna greลกka, AutoRemover je neลกto zeznuo"
+msgstr ""
 
 #: cmdline/apt-get.cc:1831
 #, fuzzy
@@ -753,276 +714,247 @@ msgstr[1] ""
 
 #: cmdline/apt-get.cc:1856
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Interna greลกka, AllUpgrade je neลกto zeznuo"
+msgstr ""
 
 #: cmdline/apt-get.cc:1955
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Trebali bi ste da pokrenete 'apt-get -f install' da popravite ove:"
+msgstr ""
 
 #: cmdline/apt-get.cc:1959
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Nezadovoljenje meฤ‘uzavisnosti. Probajte โ€žapt-get -f installโ€œ bez paketa (ili "
-"navedite reลกenje)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"Ne mogu da instaliram neke pakete. Ovo moลพe znaฤiti da ste\n"
-"zahtijevali nemoguฤ‡u situaciju ili da koristite nestabilnu\n"
-"distribuciju gdje neki zahtijevani paketi joลก uvijek nisu napravljeni\n"
-"ili su povuฤeni sa liste."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Oลกteฤ‡eni paketi"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeฤ‡i dodatni paketi ฤ‡e biti instalirani:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Predloลพeni paketi:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Preporuฤeni paketi:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "Ne mogu da pronaฤ‘em paket %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Ova komanda je zastarjela. Umjesto nje koristite \"apt-mark auto' i 'apt-"
-"mark manual'"
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Raฤunam nadogradnju..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Neuspjeลกno"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Uraฤ‘eno"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Interna greลกka, razreลกivaฤ problema je neลกto zeznuo"
+msgstr ""
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
-msgstr "Ne mogu da zakljuฤam daunloud direktorijum"
+msgstr ""
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Ne mobu naฤ‡i izvor za preuzimanje verzije '%s' od '%s'"
+msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Preuzimanje %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
-msgstr "Morate navesti makar jedan paket ฤiji izvorni kod ลพelite"
+msgstr ""
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "Ne mogu da naฤ‘em paket sa izvornim kodom za %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"PRIMETITE: o  โ€ž%sโ€œ paketu se vodi raฤuna u โ€ž%sโ€œ verziji sistema kontrole "
-"na:\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Molim koristite:\n"
-"bzr branch %s\n"
-"da dobijete najnovije (moลพda neobjavljene) nadogradnje na pakete\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Preskaฤem fajl โ€ž%sโ€œ koji je veฤ‡ skinut\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "Nemate dovoljno prostora na %s"
+msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Treba da skinem %sB/%sB arhiva sa izvornim kodom.\n"
+msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Treba da skinem %sB arhiva sa izvornim kodom.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Dovuci izvorni kod %s\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
-msgstr "Nisam uspeo da dovuฤem neke arhive."
+msgstr ""
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Preskaฤem raspakivanje veฤ‡ raspakovanog izvornog koda u %s\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "Komanda za raspakivanje โ€ž%sโ€œ nije uspjela.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Provjeravam da li je instaliran paket โ€ždpkg-devโ€œ.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
-msgstr "Komanda za pravljenje โ€ž%sโ€œ nije uspjela.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
-msgstr "Podproces se nije izvrลกio uspjeลกno"
+msgstr ""
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
-"Da biste provjerili meฤ‘uzavisnosti pri pravljenju paketa morate navesti "
-"makar jedan paket"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"Nema dostupne informacije o paketu za %s. Vidi apt.conf(5) APT::"
-"Architectures za postavku"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
-"Ne mogu da dobijem informacije o meฤ‘uzavisnosti pri pravljenju za paket %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s nema meฤ‘uzavisnosti pri pravljenju.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"%s ovisnost za %s can't se ne moลพe zadovoljiti jer %s nije dopuลกten nad '%s' "
-"paketima"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"%s meฤ‘uzavisnost za %s ne moลพe biti zadovoljena jer ne mogu da pronaฤ‘em "
-"paket %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"Nisam uspeo da zadovoljim %s meฤ‘uzavisnost za %s: Instalirani paket %s ima "
-"noviju verziju od zahtjevane"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"%s ovisnost za %s can't se ne moลพe zadovoljiti jer  verzija paketa koja je "
-"kandidat %s ne moลพe zadovoljiti zahtjeve verzije"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"%s ovisnost za %s can't se ne moลพe zadovoljiti jer  paket %s nema verziju "
-"koja je kandidat"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Nisam uspeo da zadovoljim %s meฤ‘uzavisnost za %s: %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Ne mogu da zadovoljim meฤ‘uzavisnosti pri pravljenju za %s."
+msgstr ""
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
-msgstr "Nisam uspeo da procesiram meฤ‘uzavisnosti pri pravljenju"
+msgstr ""
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Promjene za %s (%s)"
+msgstr ""
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Podrลพani moduli:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1067,86 +999,40 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Upotreba: apt-get [opcije] naredba\n"
-"apt-get [opcije] install|remove pkg1 [pkg2 ...]\n"
-"apt-get [opcije] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get je jednostavan pristup iz komandne linije za skidanje i\n"
-"instaliranje paketa. Najฤeลกฤ‡e koriลกtene naredbe su update\n"
-"i install.\n"
-"\n"
-"Komande:\n"
-"   update - Preuzima novu listu paketa\n"
-"   upgrade - Obavlja nadogradnje\n"
-"   install - Instalira nove pakete (paket se zove libc6 a ne libc6.deb)\n"
-"   remove - Uklanja pakete\n"
-"   autoremove - Automatski uklanja nekoriลกtene pakete\n"
-"   purge - Uklanja pakete i konfiguracione datoteke\n"
-"   source - Preuzima arhive s izvornim kodom\n"
-"   build-dep - Konfiguriลกe potrebne zavisnosti za izvorne pakete\n"
-"   dist-upgrade - Distribucijska nadogradnja, vidi apt-get(8)\n"
-"   dselect-upgrade - Prati dselect selekcije\n"
-"   clean - Obriลกi preuzete arhivirane datoteke\n"
-"   autoclean - Obriลกi stare preuzete arhivirane datoteke\n"
-"   check - Provjeri da nema oลกteฤ‡enih ovisnosti\n"
-"   changelog - Preuzmi i prikaลพi changelog za dati paket\n"
-"   download - Preuzmi binarni paket u dati direktorij\n"
-"\n"
-"Opcije:\n"
-"  -h Ova pomoฤ‡.\n"
-"  -q Evidentiran izlaz - bez indikatora napretka\n"
-"  -qq Bez izlaza osim greลกaka\n"
-"  -d Samo preuzimanje - NE instalirati niti otpakivati arhive\n"
-"  -s Bez djelovanja, samo simulacija\n"
-"  -y Pretpostavi yes na sva pitanja i ne pitaj\n"
-"  -f Pokuลกaj popraviti sistem s oลกteฤ‡enim zavisnostima\n"
-"  -m Pokiลกaj nastaviti ako se arhive ne mogu locirati\n"
-"  -u Prikaลพi listu nadograฤ‘enih paketa\n"
-"  -b Sagradi izvorni paket nakon preuzimanja\n"
-"  -V Prikaลพi detaljne brojeve verzija\n"
-"  -c=? Proฤitaj konfiguracionu datoteku\n"
-"  -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
-"Pogledajte man stranice the apt-get(8), sources.list(5) i apt.conf(5)\n"
-"za viลกe informacija i opcija.\n"
-"                       Ovaj APT je moฤ‡an kao superkrava.\n"
-
-#: cmdline/apt-get.cc:3577
+
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"Primjedba: Ovo je samo simulacija!\n"
-"      apt-get treba root privilegije za pravo izvrลกavanje.\n"
-"      Obratite paลพnju da je zakljuฤavanje deaktivirano,\n"
-"      dakle nemojte ovisiti na relevantnost u odnosu na realnu situaciju!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "Naลกao sam: "
+msgstr ""
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
-msgstr "Preuzimam:"
+msgstr ""
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "Preskaฤem: "
+msgstr ""
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "Greลกka: "
+msgstr ""
 
 #: cmdline/acqprogress.cc:140
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Dovukao %sB u %s (%sB/s)\n"
+msgstr ""
 
 #: cmdline/acqprogress.cc:230
 #, c-format
 msgid " [Working]"
-msgstr " [Radim]"
+msgstr ""
 
 #: cmdline/acqprogress.cc:286
 #, c-format
@@ -1155,9 +1041,6 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"Promjena medijuma: molim ubacite disk oznaฤen sa\n"
-" โ€ž%sโ€œ\n"
-"u ureฤ‘aj โ€ž%sโ€œ i pritisnite enter\n"
 
 #: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
@@ -1177,18 +1060,19 @@ msgstr "ali se %s treba instalirati"
 #: cmdline/apt-mark.cc:228
 #, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s je bio veฤ‡ postavljen na ฤekanje\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc:230
 #, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s veฤ‡ nije bio na ฤekanju.\n"
+msgstr ""
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "ฤŒekao na %s ali nije bilu tu"
+msgstr ""
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
 #, fuzzy, c-format
@@ -1202,7 +1086,7 @@ msgstr "Ne mogu otvoriti %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Izvrลกenje dpkg neuspjelo. Da li ste root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1225,38 +1109,17 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
-"Upotreba: apt-mark [oppcije] {auto|manual} pkg1 [pkg2 ...]\n"
-"\n"
-"apt-mark je jednostavno komandno suฤelje za oznaฤavanje paketa kao ruฤno "
-"ili\n"
-"automattski instaliranih. Ono takoฤ‘er lista markere.\n"
-"\n"
-"Komande:\n"
-"   auto - Oznaฤava date pakete kao automatski instalirane\n"
-"   manual - Oznaฤava date pakete kao ruฤno instalirane\n"
-"\n"
-"Opcije:\n"
-"  -h Ova pomoฤ‡.\n"
-"  -q Evidentiran izlaz - bez indikatora napretka\n"
-"  -qq Bez izlaza osim greลกaka\n"
-"  -s Bez djelovanja, samo simulacija\n"
-"  -f  ฤita/piลกe auto/ruฤno markiranje u datoj datoteci\n"
-"  -c=? Proฤitaj konfiguracionu datoteku\n"
-"  -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
-"Vidi stranice apt-mark(8) i apt.conf(5) za viลกe informacija"
 
 #: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "Ne mogu da uฤitam bazu podataka diska %s"
+msgstr ""
 
 #: methods/cdrom.cc:212
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Molim da koristite apt-cdrom da bi APT mogao prepoznati CD-ROM. apt-get "
-"update se ne moลพe koristiti za dodavanje novih CD-ROMova"
 
 #: methods/cdrom.cc:222
 #, fuzzy
@@ -1280,15 +1143,15 @@ msgstr "Datoteka nije pronaฤ‘ena"
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
 msgid "Failed to stat"
-msgstr "Ne mogu da obavim funckiju stat"
+msgstr ""
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
-msgstr "Ne mogu da postavim vrijeme izmjene"
+msgstr ""
 
 #: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "Neispravan URI, lokalni URIS ne smije poceti sa //"
+msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:173
@@ -1297,61 +1160,59 @@ msgstr "Prijavljujem se"
 
 #: methods/ftp.cc:179
 msgid "Unable to determine the peer name"
-msgstr "Ne mogu da odredim peer ime"
+msgstr ""
 
 #: methods/ftp.cc:184
 msgid "Unable to determine the local name"
-msgstr "Ne mogu da odredim lokalno ime"
+msgstr ""
 
 #: methods/ftp.cc:215 methods/ftp.cc:243
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "Server je odbio konekciju, poruka servera: %s"
+msgstr ""
 
 #: methods/ftp.cc:221
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "USER nije taฤan, poruka servera: %s"
+msgstr ""
 
 #: methods/ftp.cc:228
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "PASS nije taฤan, poruka servera:%s"
+msgstr ""
 
 #: methods/ftp.cc:248
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
-"Zamjenski server je specificiran ali nema , Acquire::ftp::ProxyLogin je "
-"prazan"
 
 #: methods/ftp.cc:276
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "Komanda login skripte '%s' nije valjana, poruka servera: %s"
+msgstr ""
 
 #: methods/ftp.cc:302
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "TYPE neispravan, poruka servera: %s"
+msgstr ""
 
 #: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
 msgid "Connection timeout"
-msgstr "Vrijeme za vezu isteklo"
+msgstr ""
 
 #: methods/ftp.cc:346
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Greลกka pri ฤitanju"
 
 #: methods/ftp.cc:356 methods/rsh.cc:206
 msgid "A response overflowed the buffer."
-msgstr "Odgovor je prenapunio bafer."
+msgstr ""
 
 #: methods/ftp.cc:373 methods/ftp.cc:385
 #, fuzzy
@@ -1359,178 +1220,189 @@ msgid "Protocol corruption"
 msgstr "Oลกteฤ‡enje protokola"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Greลกka pri pisanju"
 
 #: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
 msgid "Could not create a socket"
-msgstr "Nije moguฤ‡e napraviti socket"
+msgstr ""
 
 #: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
-msgstr "Nije moguce povezati data socket, konekcija pauzirana"
+msgstr ""
 
 #: methods/ftp.cc:713
 msgid "Could not connect passive socket."
-msgstr "Nije moguce povezati pasivni socket"
+msgstr ""
 
 #: methods/ftp.cc:730
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaffrinfo nije uspio dobiti listing socketa"
+msgstr ""
 
 #: methods/ftp.cc:744
 msgid "Could not bind a socket"
-msgstr "Nije moguฤ‡e spojiti socket"
+msgstr ""
 
 #: methods/ftp.cc:748
 msgid "Could not listen on the socket"
-msgstr "Ne mogu sluลกati na socket-u"
+msgstr ""
 
 #: methods/ftp.cc:755
 msgid "Could not determine the socket's name"
-msgstr "Nije moguฤ‡e odreditii ime socket-a"
+msgstr ""
 
 #: methods/ftp.cc:787
 msgid "Unable to send PORT command"
-msgstr "Nije moguฤ‡e poslati PORT komandu"
+msgstr ""
 
 #: methods/ftp.cc:797
 #, c-format
 msgid "Unknown address family %u (AF_*)"
-msgstr "Nepoznata family adresa %u(AF_*)"
+msgstr ""
 
 #: methods/ftp.cc:806
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT neuspio, poruka servera: %s"
+msgstr ""
 
 #: methods/ftp.cc:826
 msgid "Data socket connect timed out"
-msgstr "Data socket konekcija pauzirana"
+msgstr ""
 
 #: methods/ftp.cc:833
 msgid "Unable to accept connection"
-msgstr "Nije moguฤ‡e prihvatiti konekciju"
+msgstr ""
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
-msgstr "Problem u heลกiranju datoteke"
+msgstr ""
 
 #: methods/ftp.cc:885
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "Nije moguฤ‡e dobaviti datoteku, poruka servera '%s'"
+msgstr ""
 
 #: methods/ftp.cc:900 methods/rsh.cc:330
 msgid "Data socket timed out"
-msgstr "Data socket pauziran"
+msgstr ""
 
 #: methods/ftp.cc:930
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "Transfer podataka neuspio, poruka servera '%s'"
+msgstr ""
 
 #. Get the files information
 #: methods/ftp.cc:1007
 msgid "Query"
-msgstr "Upit"
+msgstr ""
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "Nije moguฤ‡e pozvati "
+msgstr ""
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "Povezivanje sa %s(%s)"
+msgstr ""
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgstr ""
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Nije moguฤ‡e napraviti socket za %s(f=%u t=%u p=%u)"
+msgstr ""
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ne mogu uspostaviti vezu sa %s:%s(%s)"
+msgstr ""
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nije moguฤ‡e uspostaviti konekciju sa %s:%s (%s), konekcija pauzirana"
+msgstr ""
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "Nije moguฤ‡e uspostaviti konekciju sa %s:%s (%s"
+msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "Nije moguฤ‡e razluฤiti '%s'"
+msgstr ""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "Rjeลกavam trenutni neuspijeh '%s'"
+msgstr ""
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, c-format
+msgid "System error resolving '%s:%s'"
+msgstr ""
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Neลกto se ฤudno desilo pri razrjeลกavanju '%s:%s' (%i - %s)"
+msgstr ""
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "Interna greลกka: Dobar potpis, ali ne mogu izabrati otisak kljuฤa?!"
+msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
-msgstr "Naiลกao sam na najmanje jedan neispravan potpis."
+msgstr ""
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"Ne mogu izvrลกiti 'gpgv' da provjerim potpis (da li je gpgv instaliran?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
-msgstr "Nepoznata greลกka izvrลกava gpgv"
+msgstr ""
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeฤ‡i dodatni paketi ฤ‡e biti instalirani:"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
-"Sljedeฤ‡i potpisi ne mogu biti verifikovani jer javni kljuฤ nije dostupan:\n"
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "Prazne datoteke ne mogu biti vaลพeฤ‡e arhive"
+msgstr ""
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1538,75 +1410,75 @@ msgstr "ฤŒekam na zaglavlja"
 
 #: methods/http.cc:544
 msgid "Bad header line"
-msgstr "Loลกe zaglavlje"
+msgstr ""
 
 #: methods/http.cc:569 methods/http.cc:576
 msgid "The HTTP server sent an invalid reply header"
-msgstr "HTTP server je poslao neispravno povratno zaglavlje"
+msgstr ""
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "HTTP server je poslao neispravno zaglavlje duลพine sadrลพaja"
+msgstr ""
 
 #: methods/http.cc:621
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "HTTP server je poslao neispravno zaglavlje opsega sadrลพaja"
+msgstr ""
 
 #: methods/http.cc:623
 msgid "This HTTP server has broken range support"
-msgstr "HTTP server ima oลกteฤ‡en opseg podrลกke"
+msgstr ""
 
 #: methods/http.cc:647
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
-msgstr "Izbor neuspio"
+msgstr ""
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
-msgstr "Vezi isteklo vrijeme"
+msgstr ""
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
-msgstr "Greลกka pri pisanju u izlaznu datoteku"
+msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
-msgstr "Greลกka pri upisu u datoteku"
+msgstr ""
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
-msgstr "Greลกka pri pisanju u datoteku"
+msgstr ""
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
-msgstr "Greลกka pri ฤitanju sa servera. Udaljeni kraj zatvorio konekciju."
+msgstr ""
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
-msgstr "Greลกka pri ฤitanju sa servera"
+msgstr ""
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
-msgstr "Loลกe zaglavlje podatka"
+msgstr ""
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Povezivanje neuspjeลกno"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Unutraลกnja greลกka"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu ฤitati %s"
@@ -1617,14 +1489,14 @@ msgstr "Ne mogu ฤitati %s"
 #: apt-pkg/clean.cc:123
 #, c-format
 msgid "Unable to change to %s"
-msgstr "Ne mogu da promijenim na %s"
+msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Mirror datoteke '%s' nije naฤ‘ena "
+msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1633,10 +1505,15 @@ msgstr "Mirror datoteke '%s' nije naฤ‘ena "
 msgid "Can not read mirror file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
-msgstr "[Mirror: %s]"
+msgstr ""
 
 #: methods/rred.cc:491
 #, c-format
@@ -1644,8 +1521,6 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
-"Ne mogu popraviti %s sa mmap sa upotrebom datoteฤne operacije - zakrpa je "
-"moลพda oลกteฤ‡ena."
 
 #: methods/rred.cc:496
 #, c-format
@@ -1653,16 +1528,14 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
-"Ne mogu popraviti %s sa mmap (ali bez mmap specifiฤne datoteke) - zakrpa je "
-"moลพda oลกteฤ‡ena."
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Nisam uspeo da napravim IPC cijev ka podprocesu"
+msgstr ""
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
-msgstr "Konekcija prerano zavrลกena"
+msgstr ""
 
 #: dselect/install:32
 msgid "Bad default setting!"
@@ -1675,30 +1548,24 @@ msgstr "Pritisnite enter za nastavak."
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Da li ลพelite da obriลกete stare .deb fajlove?"
+msgstr ""
 
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr ""
-"Neke greลกke su se pojavile prilikom raspakovanja. Paketa koji su bili "
-"instalirani"
 
 #: dselect/install:102
 msgid "will be configured. This may result in duplicate errors"
-msgstr "ฤ‡e biti podeลกeno. Ovo moลพe rezultirati duplim greลกkama"
+msgstr ""
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
-"ili greลกke nastale zbog nezadovoljenih meฤ‘uzavisnosti. To je u redu, samo "
-"greลกke"
 
 #: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
-"iznad ove poruke su bitne. Molim, ispravite ih i pritisnite [I] za "
-"ponovljenu instalaciju"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1722,18 +1589,8 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Upotreba: apt-extracttemplates fajl1 [fajl2 ...]\n"
-"\n"
-"apt-extracttemplates je alat za izvlaฤenje konfiguracionih i ลกablonskih\n"
-"informacija iz debian paketa\n"
-"\n"
-"Opcije:\n"
-"  -h   Ovaj pomoฤ‡ni tekst\n"
-"  -t   postavi privremeni direktorijum\n"
-"  -c=? uฤitaj ovaj konfiguracioni fajl\n"
-"  -o=? postavi proizvoljnu konfiguracionu opciju, npr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ne mogu zapisati na %s"
@@ -1745,27 +1602,27 @@ msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
 msgid "Package extension list is too long"
-msgstr "Lista paketskih proลกirenja je preduga"
+msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
 #: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
 #: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
 #, c-format
 msgid "Error processing directory %s"
-msgstr "Greลกka prilikom procesiranja direktorijuma %s"
+msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:262
 msgid "Source extension list is too long"
-msgstr "Izvorna lista proลกirenja je preduga"
+msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:379
 msgid "Error writing header to contents file"
-msgstr "Greลกka pri upisivanju zaglavlja u fajl-sadrลพaj"
+msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:409
 #, c-format
 msgid "Error processing contents %s"
-msgstr "Greลกka prilikom procesiranja sadrลพaja %s"
+msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:597
 msgid ""
@@ -1808,60 +1665,15 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
-"Upotreba: apt-ftparchive [opcije] komanda\n"
-"Komande: packages putanja_do_binarnih_paketa [fajl_sa_preinaฤenjima "
-"[prefiks_putanje]]\n"
-"          sources putanja_do_izvornih_paketa [fajl_sa_preinaฤenjima "
-"[prefiks_putanje]]\n"
-"          contents putanja\n"
-"          release putanja\n"
-"          generate konfiguracioni_fajl [grupe]\n"
-"          clean konfiguracioni_fajl\n"
-"\n"
-"apt-ftparchive generiลกe indeksne fajlove za Debian arhive. Podrลพava\n"
-"mnogo razliฤitih stilova generisanja indeksa: od potpuno automatizovanog\n"
-"do funkcionalne zamjene za dpkg-scanpackages i dpkg-scansources\n"
-"\n"
-"apt-ftparchive generiลกe Package fajlove od stabla .deb fajlova. Fajl\n"
-"Package sadrลพi u sebi sva kontrolna polja svakog od paketa\n"
-"kao i MD5 heลกeve i veliฤine fajlova. Preko fajla sa preinaฤenjima\n"
-"se mogu preinaฤiti vrijednosti za Priority i Section polja.\n"
-"\n"
-"Komanda apt-ftparchive na sliฤan naฤin generiลกe i Sources fajlove od stabla ."
-"dsc\n"
-"fajlova. Opcija --source-override se moลพe upotrijebiti da specificira fajl "
-"sa\n"
-"preinaฤenjima\n"
-"\n"
-"Komande โ€žpackagesโ€œ i โ€žsourcesโ€œ bi trebalo da se izvrลกavaju u korijenu "
-"stabla.\n"
-"putanja_do_binarnih_paketa bi trebalo da ukazuje na osnovu za rekurzivnu\n"
-"pretragu a fajl_sa_preinaฤenjima bi trebalo da sadrลพi preinaฤene parametre.\n"
-"Prefiks_putanje se nadovezuje na polja sa imenom fajla. Primjer upotrebe "
-"iz \n"
-"Debian arhive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcije:\n"
-"  -h    ovaj pomoฤ‡ni tekst\n"
-"  --md5 generisanje MD5 suma\n"
-"  -s=?  izvorni fajl sa preinaฤenjima\n"
-"  -q    rad sa smanjenim ispisom\n"
-"  -d=?  izbor opcione baze za keลกiranje\n"
-"  --no-delink ukljuฤivanje debagovanja za delink mod\n"
-"  --contents  generisanje sadrลพaja fajla\n"
-"  -c=?  uฤitaj ovaj konfiguracioni fajl\n"
-"  -o=?  postavi proizvoljnu konfiguracionu opciju"
 
 #: ftparchive/apt-ftparchive.cc:803
 msgid "No selections matched"
-msgstr "Nema stavki koje odgovaraju zadatom upitu"
+msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:881
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Neki fajlovi nedostaju u grupi paketskih fajlova โ€ž%sโ€œ"
+msgstr ""
 
 #: ftparchive/cachedb.cc:47
 #, c-format
@@ -1878,19 +1690,17 @@ msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"DB format nije validan. Ako ste unaprijedili sa starije verzije apt-a, molim "
-"vas obriลกite i ponovo napravite bazu podataka."
 
 #: ftparchive/cachedb.cc:81
 #, fuzzy, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
-msgstr "Nisam uspeo da pristupim %s"
+msgstr ""
 
 #: ftparchive/cachedb.cc:249
 msgid "Archive has no control record"
@@ -1898,166 +1708,166 @@ msgstr "Arhiva nema kontrolnog zapisa"
 
 #: ftparchive/cachedb.cc:490
 msgid "Unable to get a cursor"
-msgstr "Ne mogu da dobijem kurzor"
+msgstr ""
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "U: Ne mogu da proฤitam direktorijum %s\n"
+msgstr ""
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "U: Ne mogu da pristupim %s\n"
+msgstr ""
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
-msgstr "G: "
+msgstr ""
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
-msgstr "U: "
+msgstr ""
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
-msgstr "G: Greลกke se odnose na fajl "
+msgstr ""
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "Nisam uspeo da razrijeลกim %s"
+msgstr ""
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
-msgstr "Kretanje po stablu nije uspelo"
+msgstr ""
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr ""
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "Nisam uspeo da proฤitam link %s"
+msgstr ""
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "Nisam uspeo da obriลกem %s"
+msgstr ""
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** Nisam uspeo da napravim vezu %s na %s"
+msgstr ""
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " Dosegnuto ograniฤenje od %sB DeLinkova.\n"
+msgstr ""
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
-msgstr "Arhiva nema package polje"
+msgstr ""
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s nema override stavku\n"
+msgstr ""
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s odrลพavalac je %s a ne %s\n"
+msgstr ""
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s nema source override stavku\n"
+msgstr ""
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s nema ni binary override stavku\n"
+msgstr ""
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nisam uspeo da alociram memoriju"
+msgstr ""
 
 #: ftparchive/override.cc:35 ftparchive/override.cc:143
 #, c-format
 msgid "Unable to open %s"
-msgstr "Ne mogu da otvorim %s"
+msgstr ""
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
 #, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Loลกe formirano preklapanje %s linija %llu #1"
+msgstr ""
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
 #, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Loลกe formirano preklapanje %s linija %llu #2"
+msgstr ""
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
 #, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Loลกe formirano preklapanje %s linija %llu #3"
+msgstr ""
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "Nisam uspeo da uฤitam fajl sa preinaฤenjima %s"
+msgstr ""
 
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "Nepoznat algoritam za kompresiju โ€ž%sโ€œ"
+msgstr ""
 
 #: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "Kompresovani izlaz %s zahtjeva kompresioni skup"
+msgstr ""
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
-msgstr "Nisam uspeo da napravim FILE*"
+msgstr ""
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
-msgstr "Nisam uspeo da kreiram novi proces"
+msgstr ""
 
 #: ftparchive/multicompress.cc:206
 msgid "Compress child"
-msgstr "Dete-proces koji kompresuje"
+msgstr ""
 
 #: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "Interna greลกka, nisam uspeo da napravim %s"
+msgstr ""
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
-msgstr "UI ka podprocesu/fajlu nije uspeo"
+msgstr ""
 
 #: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
-msgstr "Nisam uspeo da uฤitam podatke dok sam izraฤunavao MD5"
+msgstr ""
 
 #: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "Problem pri brisanju %s"
+msgstr ""
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "Nisam uspeo da preimenujem %s u %s"
+msgstr ""
 
 #: cmdline/apt-internal-solver.cc:37
 msgid ""
@@ -2072,16 +1882,6 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je veza da se trenutni internom razrjeลกavaฤ\n"
-"koristi kao vanjski razrjeลกavaฤ za APT familiju radi debagovanja i sliฤnog\n"
-"\n"
-"Opcije:\n"
-"  -h Ova pomoฤ‡.\n"
-"  -q Evidentiran izlaz - bez indikatora napretka\n"
-"  -c=? Proฤitaj konfiguracionu datoteku\n"
-"  -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2100,55 +1900,44 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Upotreba: apt-sortpkgs [opcije] fajl1 [fajl2 ...]\n"
-"\n"
-"apt-sortpkgs je jednostavan alat za sortiranje paketskih fajlova. Opcija -s "
-"se koristi\n"
-"da oznaฤi vrstu fajla.\n"
-"\n"
-"Opcije:\n"
-"  -h   Ovaj pomoฤ‡ni tekst\n"
-"  -s   Koristi sortiranje fajlova sa izvornim kodom\n"
-"  -c=? Uฤitaj ovaj konfiguracioni fajl\n"
-"  -o=? Postavi neku konfiguracionu opciju, npr -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
-msgstr "Ne mogu stvoriti cijevi"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Ne mogu izvrลกiti gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Oลกteฤ‡ena arhiva"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oลกteฤ‡ena"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "Nepoznati tip TAR zaglavlja %u, ฤlan %s"
+msgstr ""
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
-msgstr "Nevaลพeฤ‡a oznaka arhive"
+msgstr ""
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
-msgstr "Greลกka pri ฤitanju zaglavlja ฤlana arhive"
+msgstr ""
 
 #: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
-msgstr "Pogreลกno zaglavlje ฤlana arhive %s"
+msgstr ""
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
-msgstr "Nevaลพeฤ‡e zaglavlje ฤlana arhive"
+msgstr ""
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
@@ -2156,38 +1945,38 @@ msgstr "Arhiva je prekratka"
 
 #: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
-msgstr "Ne mogu proฤitati zaglavlja arhive"
+msgstr ""
 
 #: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
-msgstr "\"DropNode\" pozvano nad joลก uvijek povezanim ฤvorom"
+msgstr ""
 
 #: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
-msgstr "Ne mogu pronaฤ‡i hash element!"
+msgstr ""
 
 #: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
-msgstr "Ne mogu alocirati preusmjeravanje"
+msgstr ""
 
 #: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
-msgstr "Unutraลกnja pogreลกka u \"AddDiversion\""
+msgstr ""
 
 #: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Pokuลกavam zapisati preko preusmjeravanja, %s -> %s i %s/%s"
+msgstr ""
 
 #: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "Dvostruko dodavanje preusmjeravanja %s -> %s"
+msgstr ""
 
 #: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
-msgstr "Stvori duplikat konfiguracione datoteke %s/%s"
+msgstr ""
 
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, fuzzy, c-format
@@ -2197,93 +1986,93 @@ msgstr "Ne mogu ukloniti %s"
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
-msgstr "Ne mogu zatvoriti datoteku %s"
+msgstr ""
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
-msgstr "Putanja %s je predugaฤka"
+msgstr ""
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
-msgstr "Raspakujem %s viลกe puta"
+msgstr ""
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "Direktorij %s je preusmjeren"
+msgstr ""
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paket pokuลกava zapisati na odrediลกte preusmjeravanja %s/%s"
+msgstr ""
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
-msgstr "Putanja preusmjeravanja je predugaฤka"
+msgstr ""
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
-msgstr "Direktorij %s se zamijenjuje komponentom koja nije direktorij"
+msgstr ""
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
-msgstr "Ne mogu pronaฤ‡i ฤvor u njegovoj hash ฤ‡eliji"
+msgstr ""
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Putanja je preduga"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "Zapiลกi preko podudarnosti paketa bez verzije za %s"
+msgstr ""
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Datoteka %s/%s zapisuje preko jedne u paketu %s"
+msgstr ""
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
-msgstr "Nisam u moguฤ‡nosti da ustanovim status %s"
+msgstr ""
 
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Ovo nije vaลพeฤ‡a DEB arhiva, nedostaje '%s' ฤlan"
+msgstr ""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Ovo nije vaลพeฤ‡a DEB arhiva, nema '%s', '%s' ili '%s' ฤlanova"
+msgstr ""
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
-msgstr "Interna greลกka, ne mogu da lociram ฤlana %s"
+msgstr ""
 
 #: apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
-msgstr "Neobradiva kontrolna datoteka"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
-msgstr "Ne mogu mmap-irati praznu datoteku"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:111
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Ne mogu duplicirati datoteฤni deskriptor %i"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:119
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Ne mogu napraviti mmap od %llu bajtova"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:146
 #, fuzzy
@@ -2298,7 +2087,7 @@ msgstr "Ne mogu kreirati %s"
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr "Ne mogu napraviti mmap %lu bita"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:322
 #, fuzzy
@@ -2311,8 +2100,6 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"Dinamiฤki MMap ostao bez prostora. Molim poveฤ‡ajte veliฤinu za APT::Cache-"
-"Start. Trenutna vrijednost: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:440
 #, c-format
@@ -2320,360 +2107,369 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
-"Nije moguฤ‡e poveฤ‡ati veliฤinu mmap jer je granica %lu bajtova je veฤ‡ "
-"postignuta."
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Nije moguฤ‡e poveฤ‡ati veliฤinu mmap jer je automatski rast onemoguฤ‡en od "
-"strane korisnika."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
-msgstr "Izbor %s nije pronaฤ‘en"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:491
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Neprepoznat tip skraฤ‡enice: '%c'"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:605
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "Otvaram konfiguracijsku datoteku %s"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:773
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Greลกka u sintaksi %s:%u: Blok poฤinje bez imena."
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:792
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Greลกka u sintaksi %s:%u: Deformiran tag"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Greลกka u sintaksi %s:%u: Viลกak nakon vrijednosti"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:849
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Greลกka u sintaksi %s:%u: Uputa moze biti izvrลกena samo na najviลกem nivou"
 
 #: apt-pkg/contrib/configuration.cc:856
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Greลกka u sintaksi %s:%u: Previลกe nested-a ukljuฤeno"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Greลกka u sintaksi %s:%u: Ukljuฤena odavdje"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:869
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Greลกka u sintaksi %s:%u: Nepodrzano uputstvo '%s'"
+msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:872
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Sintaksna greลกka %s:%u: clear direktiva zahitjeva stablo opcija kao agument"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Greลกka u sintaksi %s:%u: Viลกak na kraju datoteke"
+msgstr ""
 
 #: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s... Greลกka!"
+msgstr ""
 
 #: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
-msgstr "%c%s... Izvลกeno"
+msgstr ""
+
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opcija komandne linije '%c'[iz %s] nije poznata."
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
 #: apt-pkg/contrib/cmndline.cc:122
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "Opcija komandne linije %s je nerazumljiva"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Opcija komandne linije %s nije bool"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "Opcija %s zahtjeva argument"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opcija %s: Opisna stavka specifikacije mora imati an=<val>"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Opcija %s zahtijeva argument tipa integer, ne '%s'"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:268
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "Opcija '%s' je preduga"
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Sense %s is not understood, try true or false."
-msgstr "Znaฤenje %s je nerazumljivo, probaj taฤno ili netaฤno."
+msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:350
 #, c-format
 msgid "Invalid operation %s"
-msgstr "Neispravna operacija %s"
+msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "Ne mogu da stat-ujem taฤku montiranja %s"
+msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
-msgstr "Ne mogu da stat-ujem cdrom"
+msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:93
 #, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Problem u zatvaranju gzip datoteke %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "Ne koristi se zakljuฤavanje za ฤitanje zakljuฤane datoteke %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "Ne mogu otvoriti zakljuฤanu datoteku %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ne koristi se zakljuฤavanje za nfs montiranu zakljuฤanu datoteku %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
-msgstr "Ne mogu zakljuฤati %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Lista datoteka se ne moลพe kreirati kao '%s' nije direktorij"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorisan '%s' u direktoriju '%s' jer nije regularna datoteka"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Ignorisana datoteka '%s' u direktoriju '%s' jer nema ekstenziju imena"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
-"Ignorisana datoteka '%s' u direktoriju '%s' jer ima nevaลพeฤ‡u ekstenziju imena"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
-msgstr "Sub- proces %s primio je greลกku segmentacije"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s primio signal %u."
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "Sub-proces %s  je vratio kod greลกke (%u)"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "Sub-proces %s zavrลกen neoฤekivano"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
-msgstr "Ne mogu otvoriti datoteku %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
-msgstr "Nisam uspeo da napravim podprocesnu IPC"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
-msgstr "Nisam uspeo da izvrลกim kompresorski program "
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "ฤitam, joลก treba %llu proฤitati ali niลกta nije ostalo"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "piลกem, joลก treba %llu pisati ali ne mobu"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Problem u preimenovanju datoteke %s u %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Problem u razvezivanju datoteke %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
-msgstr "Problem u sinhronizaciji datoteke"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
 
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
-msgstr "Prazan keลก paket"
+msgstr ""
 
 #: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
-msgstr "Keลก paket datoteka je neispravna"
+msgstr ""
 
 #: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
-msgstr "Keลก paket datoteka je nekompatibilne verzije"
+msgstr ""
 
 #: apt-pkg/pkgcache.cc:162
 msgid "The package cache file is corrupted, it is too small"
-msgstr "Priruฤno spremiลกte paketa je oลกteฤ‡eno jer je suviลกe malo."
+msgstr ""
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "Ovaj APT ne podrลพava verziju sistema '%s'"
+msgstr ""
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
-msgstr "Keลก paket je napravljen za drukฤiju arhitekturu"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Predlaลพe"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Preporuฤuje"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
-msgstr "Prekida"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
-msgstr "Poboljลกava"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "vaลพno"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2707,64 +2503,62 @@ msgstr "Ne mogu ukloniti %s"
 #: apt-pkg/tagfile.cc:129
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "Ne mogu analizirati paketnu datoteku %s(1)"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:216
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "Ne mogu analizirati paketnu datoteku %s(2)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Loลกe formirana linija %lu u izvornoj listi %s ([option] neraลกฤlanjiva)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Loลกe formirana linija %lu u izvornoj listi %s ([option] prekratka)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Loลกe formirana linija %lu u izvornoj listi %s ([%s] nije dodjeljivanje)"
 
 #: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Loลกe formirana linija %lu u izvornoj listi %s ([%s] nema kljuฤ)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Loลกe formirana linija %lu u izvornoj listi %s ([%s] kljuฤ %s nema vrijednost)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Nepravilna linija %lu u source listi %s(URI)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Nepravilna linija %lu u source listi %s(dist)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Nepravilna linija %lu u source listi %s(URI analiza)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Nepravilna linija %lu u source listi %s(apsolutni dist)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Nepravilna linija %lu u source listi %s(dist analiza)"
+msgstr ""
 
 #: apt-pkg/sourcelist.cc:248
 #, c-format
@@ -2774,84 +2568,74 @@ msgstr "Otvaram %s"
 #: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "Linija %u preduga u source listi %s."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "Nepravilna linija %u u source listi %s(tip)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tip '%s' je nepoznat u liniji %u u source listi %s"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"Ne mogu obaviti neposrednu konfiguraciju na '%s'. Pogledajte man 5 apt.conf "
-"under APT::Immediate-Configure za detalje. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"Izvoฤ‘enje ove instalacije ฤ‡e zahtjevati trenutno uklanjanje kljuฤnog paketa "
-"%s zbog Conflicts/Pre.Depends petlje. Ovo je ฤesto loลกe, ali ako to stvarno "
-"ลพelite uฤiniti, aktivirajte APT::Force-LoopBreak opciju."
 
 #: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "Tip indexne datoteke '%s' nije podrลพan"
+msgstr ""
 
 #: apt-pkg/algorithms.cc:266
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"Paket %s je potrebno reinstalirati, ali ne mogu da naฤ‘em arhivu za njega."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"Greลกka, pkgProblemResolver::Rijeลกi nastale prekide, ovo moลพe biti uzrokovano "
-"zadrลพanim paketima."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "Ne mogu rijeลกiti probleme, ฤuvali ste neispravne pakete."
+msgstr ""
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Neke datoteke indeksa nisu uspjeลกno preuzete. One su ignorisane ili su stare "
-"koriลกtene umjesto njih."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
-msgstr "Listni direktorij %spartial nedostaje."
+msgstr ""
 
 #: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
-msgstr "Arhivni direktorij %spartial nedostaje."
+msgstr ""
 
 #: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
@@ -2863,7 +2647,7 @@ msgstr "Ne mogu kreirati %s"
 #: apt-pkg/acquire.cc:893
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Povlaฤenje datoteke %li od %li (%s ostaje)"
+msgstr ""
 
 #: apt-pkg/acquire.cc:895
 #, fuzzy, c-format
@@ -2873,48 +2657,47 @@ msgstr "ฤŒitam spisak datoteke"
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr "Metod dajver  %s ne mogu da naฤ‘em."
+msgstr ""
 
 #: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "Metod %s nije startovan ispravno"
+msgstr ""
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Molim stavite disk sa obiljeลพen: '%s' u disk '%s' i pritisnite enter."
+msgstr ""
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "Paketni sistem '%s' nije podrลพan"
+msgstr ""
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
-msgstr "Ne mogu da odredim odgovarajuฤ‡i tip sistema za pakovanje"
+msgstr ""
 
 #: apt-pkg/clean.cc:57
 #, c-format
 msgid "Unable to stat %s."
-msgstr "Nisam mogao pristupiti %s."
+msgstr ""
 
 #: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Morate staviti neki 'izvorni' URI u vaลกu sources.list datoteku"
+msgstr ""
 
 #: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"Spiskovi paketa ili datoteka sa stanjem se ne moลพe raลกฤlaniti ili otvoriti."
 
 #: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
-msgstr "Moลพda ลพelite da pokrenete apt-get update da rijeลกite ove probleme"
+msgstr ""
 
 #: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
-msgstr "Ne mogu da proฤitam listu izvora."
+msgstr ""
 
 #: apt-pkg/policy.cc:75
 #, c-format
@@ -2922,191 +2705,179 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
-"Vrijednost '%s' je nevaลพeฤ‡a za APT::Default-Release poลกto tog izdanja nema u "
-"izvornom kodu"
 
 #: apt-pkg/policy.cc:399
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Nevaลพeฤ‡i slog u datoteci postavki %s, nema zaglavlja paketa"
+msgstr ""
 
 #: apt-pkg/policy.cc:421
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "Ne razumijem pin tipa %s"
+msgstr ""
 
 #: apt-pkg/policy.cc:429
 msgid "No priority (or zero) specified for pin"
-msgstr "Nema prioriteta (ili nula) specificiranog za pin"
+msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:87
 msgid "Cache has an incompatible versioning system"
-msgstr "Keลก ima nekompatibilan sistem za upravljanje verzijama"
+msgstr ""
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Greลกka prilikom obrade %s (%s%d)"
+msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:251
 msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Premaลกili ste broj imena paketa koje ovaj APT dozvoljava."
+msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:254
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Premaลกili ste broj verzija koje dozvoljava ovaj APT."
+msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Premaลกili ste broj opisa koje dozvoljava ovaj APT."
+msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Premaลกili ste broj zavisnosti koje ovaj APT podrลพava."
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Paket %s %s nije pronaฤ‘en tokom obrade zavisnosti datoteke"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "Ne mogu da stat-am source paketnu listu %s"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ฤŒitam spiskove paketa"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
-msgstr "Skupljam datoteฤne usluge"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
-msgstr "UI Greลกka u spaลกavanju source keลกa"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
-msgstr "preimenovanje neuspjelo, %s(%s->%s)."
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:599
 msgid "MD5Sum mismatch"
-msgstr "MD5Sum se ne poklapa"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
-msgstr "Hash Sum se ne poklapa"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
-"Ne mogu naฤ‡i oฤekivani unos  '%s' u Release datoteci (Pogreลกan red u sources."
-"list ili loลกe formirana datoteka)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
-msgstr "Javni kljuฤ nije dostupan za sljedeฤ‡e ID-ove kljuฤeva:\n"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"Datoteka izdanja za %s je istekla (nevaลพeฤ‡a nakon %s). Nadogradnje za ovaj "
-"repozitorij neฤ‡e biti primijenjene."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Konfliknta distribucija: %s (oฤekivano %s ali dobijeno %s)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
-"Doลกlo je do pogreลกke tijekom provjere potpisa. Repozitorij nije aลพuriran i "
-"prethodna indeks datoteka ฤ‡e se koristiti. GPG greลกkar:%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr "GPG greลกka: %s: %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"Nisam mogao da pronaฤ‘em datoteku za paket %s. Moลพda ฤ‡ete morati ruฤno da "
-"popravljate ovaj problem. (zbog arch-a koji nedostaje)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
-"Nisam mogao naฤ‡i datoteku za %s paket. To moลพda znaฤi da ga morate ruฤno "
-"popraviti."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
-msgstr "Indeksne datoteke su oลกteฤ‡ene. Nema imena datoteka: polje za paket %s."
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
-msgstr "Veliฤina se ne poklapa"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
-msgstr "Nema sekcija u datoteci izdanja %s"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr "Nema Hash elemenata u datoteci izdanja %s"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Nevaลพeฤ‡i 'Valid-Until'  u datoteci izdanja %s"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
@@ -3114,7 +2885,7 @@ msgstr "Ne mogu otvoriti DB datoteku %s"
 #: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "Glavni blok %s ne sadrลพi otiske"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:576
 #, c-format
@@ -3122,19 +2893,17 @@ msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"Koristim CD-ROM-ovu taฤku montiranja %s\n"
-"Montiram CD-ROM\n"
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Identificiram.. "
+msgstr ""
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Spremljena labela: %s\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Pogreลกan CD"
@@ -3142,11 +2911,11 @@ msgstr "Pogreลกan CD"
 #: apt-pkg/cdrom.cc:642
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "Koristim taฤku montiranja CD-ROM-a %s\n"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:660
 msgid "Unmounting CD-ROM\n"
-msgstr "Demontiram CD-ROM\n"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:665
 #, fuzzy
@@ -3155,11 +2924,11 @@ msgstr "ฤŒekam na zaglavlja"
 
 #: apt-pkg/cdrom.cc:674
 msgid "Mounting CD-ROM...\n"
-msgstr "Montiram CD-ROM...\n"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:693
 msgid "Scanning disc for index files..\n"
-msgstr "Skeniram disk za indeksne datoteke..\n"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:744
 #, c-format
@@ -3167,25 +2936,21 @@ msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
-"Naฤ‘eno %zu indeksa paketa, %zu izvornih indeksa, %zu prevodilaฤkih indeksa i "
-"%zu potpisa\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
-"Ne mogu pronaฤ‡i datoteku paketa, moลพda to nije Debian disk ili je pogreลกne "
-"arhitekture?"
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "Naฤ‘ena labela '%s'\n"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
-msgstr "Ovo nije ispravno ime, probajte ponovo.\n"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:828
 #, c-format
@@ -3193,74 +2958,59 @@ msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
-"Ovaj disk je nazvan:\n"
-"'%s'\n"
 
 #: apt-pkg/cdrom.cc:830
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "ฤŒitam spiskove paketa"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
-msgstr "piลกem novu source listu\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
-msgstr "Source lista ulaza za disk je:\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
-msgstr "Napisano %i zapisa.\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
-msgstr "Napisano %i zapisa sa %i datoteka koje nedostaju.\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Napisano %i zapisa sa %i neodgovarajuฤ‡ih datoteka\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"Napisano %i zapisa sa %i datoteka koje nedostaju i %i neodgovarajuฤ‡ih "
-"datoteka\n"
 
 #: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr "Ne mogu naฤ‡i slog autentifikacije za: %s"
+msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
 #, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Hash neslaganje za: %s"
-
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datoteka %s ne poฤinje ispravno potpisanom porukom"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
+msgstr ""
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "Nije pronaฤ‘eno izdanje โ€ž%sโ€œ za โ€ž%sโ€œ."
+msgstr ""
 
 #: apt-pkg/cacheset.cc:406
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "Nije pronaฤ‘ena verzija โ€ž%sโ€œ za โ€ž%sโ€œ"
+msgstr ""
 
 #: apt-pkg/cacheset.cc:517
 #, fuzzy, c-format
@@ -3270,12 +3020,12 @@ msgstr "Ne mogu otvoriti %s"
 #: apt-pkg/cacheset.cc:523
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "Ne mogu naฤ‡i paket regularnim izrazom '%s'"
+msgstr ""
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Ne mogu odabrati verzije iz paketa '%s' jer je ฤisto virtualan"
+msgstr ""
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3283,187 +3033,166 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
-"Ne mogu odabrati instaliranu niti kandidatsku verziju iz paketa '%s' jer "
-"nije nijedna od njih"
 
 #: apt-pkg/cacheset.cc:555
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Ne mogu odabrati najnoviju verziju iz paketa '%s' jer je ฤisto virtuelna"
 
 #: apt-pkg/cacheset.cc:563
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Ne mogu odabrati kandidatsku verziju iz paketa %s jer nema kandidata"
+msgstr ""
 
 #: apt-pkg/cacheset.cc:571
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
-msgstr "Ne mogu odabrati instaliranu verziju iz paketa %s jer nije instaliran"
+msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr "Slanje scenarija rjeลกavaฤu"
+msgstr ""
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr "Slanje zahtjeva rjeลกavaฤu"
+msgstr ""
 
 #: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
-msgstr "Priprema za prijem rjeลกenja"
+msgstr ""
 
 #: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
-msgstr "Spoljnji razrjeลกivaฤ pao bez odgovarajuฤ‡e poruke o greลกci"
+msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
-msgstr "Izvrลกenje spoljnjeg razrjeลกivaฤa"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr "Zabiljeลพen nestanak %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr "Pokreฤ‡em post-instalacijski okidaฤ %s"
+msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
-msgstr "Direktorij '%s' nedostaje"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "Pripremam se za konfiguraciju %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr "Pripremam za uklanjanje %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporuฤuje"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
-msgstr "Pripremam da u potpunosti uklonim %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
-"Ne mogu da napiลกem izvjeลกtaj, openpty() neuspjela (/dev/pts nije "
-"montirana?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
-msgstr "Pokreฤ‡em dpkg"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
-msgstr "Operacija je prekinuta prije nego se mogla zavrลกiti"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
-"Nije napravljen apport izvjeลกtaj jer je dosegnut maksimalni broj izvjeลกtaja"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
-msgstr "problemi sa meฤ‘uzavisnostima - ostavljam nekonfigurisano"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
-"Nije napravljen apport izvjeลกtaj jer poruka greลกke indicira da je prateฤ‡a "
-"greลกka od prethodnog neuspjeha"
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
-"Nije napravljen apport izvjeลกtaj jer poruka greลกke indicira greลกku punog "
-"diska"
 
 #: apt-pkg/deb/dpkgpm.cc:1496
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
-"Nije napravljen apport izvjeลกtaj jer poruka greลกke indicira greลกku "
-"nedostatka memorije"
-
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nema apport izvjeลกtaja napisanog jer greลกka indicira problem na lokalnom "
-"sistemu"
 
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
-"Nije napravljen apport izvjeลกtaj jer poruka greลกke indicira dpkg I/O greลกku"
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
@@ -3471,13 +3200,11 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
-"Ne mogu zakljuฤati administracijski direktorij (%s), da li ga drugi proces "
-"koristi?"
 
 #: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ne mogu zakljuฤati administracijski direktorij (%s), da li ste root?"
+msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3485,11 +3212,11 @@ msgstr "Ne mogu zakljuฤati administracijski direktorij (%s), da li ste root?"
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg je prekinut morate ruฤno pokrenuti '%s' da popravite problem. "
+msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
-msgstr "Nije zakljuฤano"
+msgstr ""
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "Ne mogu ukloniti %s"
diff --git a/po/ca.po b/po/ca.po
index 1e7fb549c..1df614e6a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-10-19 13:30+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -96,74 +96,74 @@ msgstr "Nombre total de l'espai atribuรฏt a: "
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet estร  desincronitzat."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "No s'han trobat paquets"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Heu de donar com a mรญnim un patrรณ de cerca"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Aquesta ordre รฉs desaconsellada. Empreu ยซapt-mark showautoยป en el seu lloc."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No s'ha trobat el paquet %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Memรฒria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instaล€lat: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Taula de versiรณ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,20 +237,28 @@ msgstr ""
 "Vegeu les pร gines de manual apt-cache(8) i apt.conf(5) per a mรฉs "
 "informaciรณ.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Doneu un nom per a aquest disc, com per exemple ยซDebian 5.0.3 Disc 1ยป"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inseriu un disc en la unitat i premeu Intro"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "No s'ha pogut muntar ยซ%sยป a ยซ%sยป"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetiu aquest procรฉs per a la resta de CD del vostre joc."
 
@@ -487,7 +495,7 @@ msgstr "No es possible la reinstaล€laciรณ del paquet %s, no es pot baixar.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s ja es troba en la versiรณ mรฉs recent.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instaล€lat manualment.\n"
@@ -599,8 +607,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Desprรฉs d'aquesta operaciรณ s'alliberaran %sB d'espai en disc.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -639,7 +647,7 @@ msgstr "Avortat."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
@@ -648,7 +656,7 @@ msgstr "No s'ha pogut obtenir %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Baixada completa i en mode de nomรฉs baixada"
 
@@ -734,7 +742,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "La informaciรณ segรผent pot ajudar-vos a resoldre la situaciรณ:"
 
@@ -785,7 +793,7 @@ msgstr ""
 "Dependรจncies insatisfetes. Proveu amb ยซapt-get -f installยป sense paquets (o "
 "especifiqueu una soluciรณ)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -797,33 +805,33 @@ msgstr ""
 "ยซunstableยป i alguns paquets requerits encara no han estat creats o bรฉ\n"
 "encara no els hi han introduรฏt des d'ยซIncomingยป."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "S'instaล€laran els segรผents paquets extres:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "S'ha marcat %s com instaล€lat automร ticament.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -831,47 +839,47 @@ msgstr ""
 "Aquesta ordre รฉs desaconsellada. Empreu ยซapt-mark autoยป i ยซapt-mark manualยป "
 "en el seu lloc."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "S'estร  calculant l'actualitzaciรณโ€ฆ "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "S'ha produรฏt un error intern, el solucionador de problemes ha trencat coses"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "No รฉs possible blocar el directori de descร rrega"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "No es troba una font per baixar la versiรณ ยซ%sยป de ยซ%sยป"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "S'estร  baixant %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -881,7 +889,7 @@ msgstr ""
 "versions ยซ%sยป a:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -893,71 +901,71 @@ msgstr ""
 "per obtenir les รบltimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'estร  ometent el fitxer ja baixat ยซ%sยป\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obtรฉn el font %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "S'estร  ometent el desempaquetament de les fonts que ja ho estan en %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar ยซ%sยป ha fallat.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comproveu si el paquet ยซdpkgdevยป estร  instaล€lat.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir ยซ%sยป ha fallat.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Ha fallat el procรฉs fill"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "S'ha d'especificar un paquet per a verificar les dependรจncies de construcciรณ "
 "per a"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -966,18 +974,18 @@ msgstr ""
 "No hi ha informaciรณ d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
 "APT::Architectures per a configurar-ho"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "No es pot obtenir informaciรณ sobre les dependรจncies de construcciรณ per a %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tรฉ dependรจncies de construcciรณ.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -986,7 +994,7 @@ msgstr ""
 "La dependรจncia %s en %s no es pot satisfer perquรจ %s no รฉs permรจs als "
 "paquets ยซ%sยป"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -995,14 +1003,14 @@ msgstr ""
 "La dependรจncia %s en %s no es pot satisfer perquรจ no es pot trobar el paquet "
 "%s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No s'ha pogut satisfer la dependรจncia %s per a %s: El paquet instaล€lat %s รฉs "
 "massa nou"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1011,7 +1019,7 @@ msgstr ""
 "La dependรจncia %s per a %s no es pot satisfer perquรจ la versiรณ candidata del "
 "paquet %s no pot satisfer els requeriments de versions"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1020,30 +1028,30 @@ msgstr ""
 "La dependรจncia %s en %s no es pot satisfer perquรจ el paquet %s no tรฉ versiรณ "
 "candidata"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No s'ha pogut satisfer la dependรจncia %s per a %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No s'han pogut satisfer les dependรจncies de construcciรณ per a %s"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependรจncies de construcciรณ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Registre de canvis per a %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรฒduls suportats:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1135,7 +1143,7 @@ msgstr ""
 "per a obtenir mรฉs informaciรณ i opcions.\n"
 "                       Aquest APT tรฉ superpoders bovins.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1210,7 +1218,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ja estava no retingut.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s perรฒ no hi era"
@@ -1250,26 +1259,6 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
-"Forma d'รบs: apt-mark [opcions] {auto|manual} paq1 [paq2 โ€ฆ]\n"
-"\n"
-"apt-mark รฉs una interfรญcie simple de la lรญnia d'ordres per a marcar\n"
-"paquets com a instaล€lats automร ticament o manual. Tambรฉ pot llistar\n"
-"les marques.\n"
-"\n"
-"Ordres:\n"
-"\n"
-"    auto - Marca els paquets donats com a instaล€lats automร ticament\n"
-"    manual - Marca els paquets donats com a instaล€lats manualment\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -q   Sortida enregistrable - sense indicador de progrรฉs\n"
-"  -qq  Sense sortida, llevat dels errors\n"
-"  -s   No actues. Mostra nomรฉs quรจ es faria.\n"
-"  -f   Llegeix/escriu les marques auto/manual emprant el fitxer donat\n"
-"  -c=? Llegeix aquest fitxer de configuraciรณ\n"
-"  -o=? Estableix una opciรณ de configuraciรณ, p. ex: -o dir::cache=/tmp\n"
-"Vegeu les pร gines de manual apt-mark(8) i apt.conf(5) per a mรฉs informaciรณ."
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -1368,8 +1357,8 @@ msgstr "Temps de connexiรณ finalitzat"
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexiรณ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Error de lectura"
 
@@ -1382,8 +1371,8 @@ msgid "Protocol corruption"
 msgstr "Protocol corromput"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Error d'escriptura"
 
@@ -1438,7 +1427,7 @@ msgstr "S'ha esgotat el temps de connexiรณ al sรฒcol de dades"
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexiรณ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1465,89 +1454,102 @@ msgstr "Consulta"
 msgid "Unable to invoke "
 msgstr "No es pot invocar"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "S'estร  connectant amb %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "No s'ha pogut crear un sรฒcol per a %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "No es pot iniciar la connexiรณ amb %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexiรณ excedit"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No s'ha pogut connectar amb %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "S'estร  connectant amb %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No s'ha pogut resoldre ยซ%sยป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "S'ha produรฏt un error temporal en resoldre ยซ%sยป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Ha passat alguna cosa estranya en resoldre ยซ%s:%sยป (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Ha passat alguna cosa estranya en resoldre ยซ%s:%sยป (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "No es pot connectar amb %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error intern: La signatura รฉs correcta, perรฒ no s'ha pogut determinar "
 "l'emprempta digital de la clau!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invร lida."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar el ยซgpgvยป per a verificar la signatura (estร  "
 "instaล€lat el gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produรฏt un error desconegut en executar el gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures segรผents sรณn invร lides:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1587,54 +1589,54 @@ msgstr "Aquest servidor HTTP tรฉ el suport d'abast trencat"
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Ha fallat la selecciรณ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Connexiรณ finalitzada"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "S'ha produรฏt un error en escriure al fitxer de sortida"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "S'ha produรฏt un error en escriure al fitxer"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "S'ha produรฏt un error en escriure al fitxer"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "S'ha produรฏt un error en llegir, el servidor remot ha tancat la connexiรณ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "S'ha produรฏt un error en llegir des del servidor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Capรงalera de dades no vร lida"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Ha fallat la connexiรณ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Error intern"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
@@ -1661,7 +1663,12 @@ msgstr "No s'ha trobat el fitxer rรจplica ยซ%sยป"
 msgid "Can not read mirror file '%s'"
 msgstr "No es pot llegir el fitxer rรจplica ยซ%sยป"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "No es pot llegir el fitxer rรจplica ยซ%sยป"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Rรจplica: %s]"
@@ -1760,7 +1767,7 @@ msgstr ""
 "  -c=? Llegeix aquest fitxer de configuraciรณ\n"
 "  -o=? Estableix una opciรณ de conf arbitrร ria, p.e. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No es pot escriure en %s"
@@ -1906,8 +1913,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "No es pot obrir el fitxer de DB %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No es pot determinar l'estat de %s"
@@ -1920,87 +1927,87 @@ msgstr "Arxiu sense registre de control"
 msgid "Unable to get a cursor"
 msgstr "No es pot aconseguir un cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: No es pot llegir el directori %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: No es pot veure l'estat %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Els errors s'apliquen al fitxer "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "No s'ha pogut resoldre %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "L'arbre estร  fallant"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "No s'ha pogut obrir %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "No s'ha pogut llegir l'enllaรง %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "No s'ha pogut alliberar %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** No s'ha pogut enllaรงar %s a %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink s'ha arribat al lรญmit de %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arxiu sense el camp paquet"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s no tรฉ una entrada dominant\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el mantenidor de %s รฉs %s, no %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s no tรฉ una entrada dominant de font\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s no tรฉ una entrada dominant de binari\n"
@@ -2074,7 +2081,7 @@ msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
 msgid "Problem unlinking %s"
 msgstr "S'ha trobat un problema treient l'enllaรง %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s"
@@ -2132,23 +2139,23 @@ msgstr ""
 "  -c=? Llegeix aquest fitxer de configuraciรณ\n"
 "  -o=? Estableix una opciรณ de configuraciรณ, p. ex: -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "No es poden crear els conductes"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "No es pot executar el gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Arxiu corromput"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "La suma de comprovaciรณ de tar ha fallat, arxiu corromput"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Capรงalera TAR desconeguda del tipus %u, membre %s"
@@ -2219,54 +2226,54 @@ msgstr "No s'ha pogut escriure el fitxer %s"
 msgid "Failed to close file %s"
 msgstr "Ha fallat el tancament del fitxer %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "La ruta %s รฉs massa llarga"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "S'estร  desempaquetant %s mรฉs d'una vegada"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El directori %s estร  desviat"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "El paquet estร  intentant escriure en l'objectiu desviat %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "La ruta de desviaciรณ รฉs massa llarga"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "El directori %s estร  sent reemplaรงat per un no-directori"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "No s'ha trobat el node dins de la taula"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "La ruta รฉs massa llarga"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "S'estร  sobreescrivint el corresponent paquet sense versiรณ per a %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "El fitxer %s/%s sobreescriu al que estร  en el paquet %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No es pot veure l'estat de %s"
@@ -2348,30 +2355,30 @@ msgstr ""
 "estร  deshabilitat per l'usuari."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecciรณ %s"
@@ -2443,6 +2450,16 @@ msgstr "%c%sโ€ฆ Error!"
 msgid "%c%s... Done"
 msgstr "%c%sโ€ฆ Fet"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "โ€ฆ"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%sโ€ฆ %u%%"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2503,45 +2520,45 @@ msgstr "No s'ha pogut fer ยซstatยป del cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No es pot resoldre el fitxer de blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No s'ha pogut blocar %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "No es pot crear la llista de fitxers perquรจ ยซ%sยป no รฉs un directori"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "S'estร  descartant ยซ%sยป al directori ยซ%sยป perquรจ no รฉs un fitxer normal"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "S'estร  descartant ยซ%sยป al directori ยซ%sยป perquรจ no tรฉ extensiรณ del nom de "
 "fitxer"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2549,73 +2566,79 @@ msgstr ""
 "S'estร  descartant ยซ%sยป al directori ยซ%sยป perquรจ tรฉ una extensiรณ del nom de "
 "fitxer invร lida"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El sub-procรฉs %s ha rebut una violaciรณ de segment."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El sub-procรฉs %s ha rebut un senyal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El sub-procรฉs %s ha retornat un codi d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El sub-procรฉs %s ha sortit inesperadament"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "No s'ha pogut crear el subprocรฉs IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "No s'ha pogut executar el compressor "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "llegits, falten %llu per llegir, perรฒ no queda res"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escrits, falten %llu per escriure perรฒ no s'ha pogut"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Ha hagut un problema en tancar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Ha hagut un problema en desenllaรงar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Ha hagut un problema en sincronitzar el fitxer"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No s'ha instaล€lat cap clauer a %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Memรฒria cau de paquets รฉs buida"
@@ -2641,59 +2664,59 @@ msgstr "Aquest APT no suporta el sistema de versions ยซ%sยป"
 msgid "The package cache was built for a different architecture"
 msgstr "La memรฒria cau de paquets fou creada per a una arquitectura diferent"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depรจn"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Predepรจn"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomana"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Reemplaรงa"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Fa obsolet"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Trenca"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Millora"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "requerit"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "estร ndard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2796,17 +2819,17 @@ msgstr "S'estร  obrint %s"
 msgid "Line %u too long in source list %s."
 msgstr "La lรญnia %u รฉs massa llarga en la llista de fonts %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "La lรญnia %u รฉs malformada en la llista de fonts %s (tipus)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "El tipus ยซ%sยป no รฉs conegut en la lรญnia %u de la llista de fonts %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2815,12 +2838,12 @@ msgstr ""
 "No s'ha pogut realitzar la configuraciรณ immediata de ยซ%sยป. Vegeu man 5 apt."
 "conf, sota APT::Immediate-Configure per a mรฉs detalls. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "No s'ha pogut configurar ยซ%sยป."
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2844,7 +2867,7 @@ msgid ""
 msgstr ""
 "El paquet %s necessita ser reinstaล€lat, perรฒ no se li pot trobar un arxiu."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2852,13 +2875,13 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ha generat pauses, aixรฒ pot haver estat "
 "causat per paquets retinguts."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No es poden corregir els problemes, teniu paquets retinguts que estan "
 "trencats."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2866,7 +2889,7 @@ msgstr ""
 "Alguns รญndex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
 "emprat els antics."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta el directori de llistes %spartial."
@@ -2903,17 +2926,17 @@ msgstr "No s'ha pogut trobar el mรจtode de control %s."
 msgid "Method %s did not start correctly"
 msgstr "El mรจtode %s no s'ha iniciat correctament"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inseriu el disc amb l'etiqueta: ยซ%sยป en la unitat ยซ%sยป i premeu Intro."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetament ยซ%sยป no estร  suportat"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
 
@@ -2970,14 +2993,14 @@ msgstr "La memรฒria cau tรฉ un sistema de versions incompatible"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "S'ha produรฏt un error en processar %s (%s%d)"
@@ -3004,27 +3027,27 @@ msgstr ""
 "Uau, heu excedit el nombre de dependรจncies que aquest APT รฉs capaรง de "
 "gestionar."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "No s'ha trobat el paquet %s %s en processar les dependรจncies del fitxer"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No s'ha pogut llegir la llista de paquets font %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "S'estร  llegint la llista de paquets"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "S'estan recollint els fitxers que proveeixen"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Error d'E/S en desar la memรฒria cau de la font"
 
@@ -3037,12 +3060,12 @@ msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 no concorda"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3051,16 +3074,16 @@ msgstr ""
 "No s'ha trobat l'entrada ยซ%sยป esperada, al fitxer Release (entrada errรฒnia "
 "al sources.list o fitxer malformat)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "No s'ha trobat la suma de comprovaciรณ per a ยซ%sยป al fitxer Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "No hi ha cap clau pรบblica disponible per als segรผents ID de clau:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3069,15 +3092,15 @@ msgstr ""
 "El fitxer Release per a %s ha caducat (invร lid des de %s). Les "
 "actualitzacions per a aquest dipรฒsit no s'aplicaran."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuciรณ en conflicte: %s (s'esperava %s perรฒ s'ha obtingut %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "S'ha produรฏt un error durant la verificaciรณ de la signatura. El dipรฒsit no "
@@ -3085,12 +3108,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "S'ha produรฏt un error amb el GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,7 +3123,7 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,7 +3132,7 @@ msgstr ""
 "No s'ha trobat un fitxer pel paquet %s. Aixรฒ podria significar que haureu "
 "d'arreglar aquest paquet manualment."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3117,31 +3140,31 @@ msgstr ""
 "L'รญndex dels fitxers en el paquet estร  corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "No es pot analitzar el fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "No hi ha seccions al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "No hi ha una entrada Hash al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "El camp ยซValid-Untilยป al fitxer Release %s รฉs invร lid"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "El camp ยซDateยป al fitxer Release %s รฉs invร lid"
@@ -3169,7 +3192,7 @@ msgstr "S'estร  identificantโ€ฆ"
 msgid "Stored label: %s\n"
 msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "S'esta desmuntant el CD-ROMโ€ฆ\n"
 
@@ -3233,30 +3256,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "S'estan copiant les llistes de paquetsโ€ฆ"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "S'estร  escrivint una nova llista de fonts\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrades de la llista de fonts per a aquest disc sรณn:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3273,17 +3296,6 @@ msgstr "No s'ha pogut trobar el registre d'autenticatiรณ per a: %s"
 msgid "Hash mismatch for: %s"
 msgstr "El resum no coincideix per a: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "El fitxer %s no comenรงa amb un missatge signat en clar"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaล€lat cap clauer a %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3357,115 +3369,115 @@ msgstr "Prepara per a rebre una soluciรณ"
 msgid "External solver failed without a proper error message"
 msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Executa un resoledor extern"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "S'estร  instaล€lant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "S'estร  configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "S'estร  suprimint el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "S'ha suprimit completament %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "S'estร  anotant la desapariciรณ de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "S'estร  executant l'activador de postinstaล€laciรณ %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No s'ha pogut obrir el fitxer ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "S'estร  preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'estร  desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'estร  preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instaล€lat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'estร  preparant per a la supressiรณ del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'estร  preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 "pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "S'estร  executant dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "S'ha interromput l'operaciรณ abans que poguรฉs finalitzar"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "No s'ha escrit cap informe perquรจ ja s'ha superat MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "S'han produรฏt problemes de depรจncies, es deixa sense configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3473,7 +3485,7 @@ msgstr ""
 "No s'ha escrit cap informe perquรจ el missatge d'error indica que รฉs un error "
 "consequent de una fallida anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3489,13 +3501,7 @@ msgstr ""
 "No s'ha escrit cap informe perquรจ el missatge d'error indica una fallida per "
 "falta de memรฒria"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3530,23 +3536,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "No blocat"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Ha passat alguna cosa estranya en resoldre ยซ%s:%sยป (%i - %s)"
-
-#~ msgid "..."
-#~ msgstr "โ€ฆ"
-
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%sโ€ฆ %u%%"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "S'ha produรฏt un error durant la verificaciรณ de la signatura. El dipรฒsit "
-#~ "no estร  actualitzat i s'emprarร  el fitxer d'รญndex anterior. Error del "
-#~ "GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "El fitxer %s no comenรงa amb un missatge signat en clar"
 
 #~ msgid "decompressor"
 #~ msgstr "decompressor"
diff --git a/po/cs.po b/po/cs.po
index 993e105f3..7c81bc778 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-07-08 13:46+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -95,72 +95,72 @@ msgstr "Celkem pล™iล™azenรฉho mรญsta: "
 msgid "Package file %s is out of sync."
 msgstr "Soubor balรญku %s je ลกpatnฤ› synchronizovanรฝ."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nebyly nalezeny ลพรกdnรฉ balรญky"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Musรญte zadat alespoลˆ jeden vyhledรกvacรญ vzor"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Tento pล™รญkaz je zastaralรฝ, pouลพijte mรญsto nฤ›j โ€žapt-mark showautoโ€œ."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nelze najรญt balรญk %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Soubory balรญku:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache nenรญ synchronizovanรก, nemohu se odkรกzat na soubor balรญku"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Vypรญchnutรฉ balรญky:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalovanรก verze: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidรกt: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ลพรกdnรก)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Vypรญchnutรฝ balรญk: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabulka verzรญ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pro %s zkompilovรกn na %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -229,20 +229,28 @@ msgstr ""
 "  -o=? Nastavรญ libovolnou volbu, napล™. -o dir::cache=/tmp\n"
 "Vรญce informacรญ viz manuรกlovรฉ strรกnky apt-cache(8) a apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Zadejte prosรญm nรกzev tohoto mรฉdia, napล™. โ€žDebian 5.0.3 Disk 1โ€œ"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vloลพte prosรญm mรฉdium do mechaniky a stisknฤ›te enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Selhalo pล™ipojenรญ โ€ž%sโ€œ na โ€ž%sโ€œ"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Tento proces opakujte pro vลกechna zbรฝvajรญcรญ mรฉdia."
 
@@ -478,7 +486,7 @@ msgstr "Pล™einstalace %s nenรญ moลพnรก, protoลพe nelze stรกhnout.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s je jiลพ nejnovฤ›jลกรญ verze.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovanรฝ ruฤnฤ›.\n"
@@ -586,8 +594,8 @@ msgstr "Po tรฉto operaci bude na disku pouลพito dalลกรญch %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tรฉto operaci bude na disku uvolnฤ›no %sB.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nelze urฤit volnรฉ mรญsto v %s"
@@ -626,7 +634,7 @@ msgstr "Pล™eruลกeno."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokraฤovat [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo staลพenรญ %s  %s\n"
@@ -635,7 +643,7 @@ msgstr "Selhalo staลพenรญ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Nฤ›kterรฉ soubory nemohly bรฝt staลพeny"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Stahovรกnรญ dokonฤeno v reลพimu pouze stรกhnout"
 
@@ -722,7 +730,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Nรกsledujรญcรญ informace vรกm mohou pomoci vyล™eลกit tuto situaci:"
 
@@ -774,7 +782,7 @@ msgstr ""
 "Nesplnฤ›nรฉ zรกvislosti. Zkuste spustit โ€žapt-get -f installโ€œ bez balรญkลฏ (nebo "
 "navrhnฤ›te ล™eลกenรญ)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -785,33 +793,33 @@ msgstr ""
 "nemoลพnou situaci, nebo, pokud pouลพรญvรกte nestabilnรญ distribuci, ลพe\n"
 "vyลพadovanรฉ balรญky jeลกtฤ› nebyly vytvoล™eny nebo pล™esunuty z Pล™รญchozรญ fronty."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Poลกkozenรฉ balรญky"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Nรกsledujรญcรญ extra balรญky budou instalovรกny:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Navrhovanรฉ balรญky:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Doporuฤovanรฉ balรญky:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nelze najรญt balรญk %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s nastaven jako instalovanรฝ automaticky.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -819,46 +827,46 @@ msgstr ""
 "Tento pล™รญkaz je zastaralรฝ, pouลพijte mรญsto nฤ›j โ€žapt-mark autoโ€œ a โ€žapt-mark "
 "manualโ€œ."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Propoฤรญtรกvรกm aktualizaciโ€ฆ "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitล™nรญ chyba, ล™eลกitel problรฉmลฏ pokazil vฤ›ci"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Nelze zamknout adresรกล™ pro stahovรกnรญ"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nelze najรญt zdroj pro staลพenรญ verze โ€ž%sโ€œ balรญku โ€ž%sโ€œ"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Stahuje se %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musรญte zadat aspoลˆ jeden balรญk, pro kterรฝ se stรกhnou zdrojovรฉ texty"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nelze najรญt zdrojovรฝ balรญk pro %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -867,7 +875,7 @@ msgstr ""
 "INFO: Balรญk โ€ž%sโ€œ je spravovรกn v systรฉmu pro sprรกvu verzรญ โ€ž%sโ€œ na:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -878,70 +886,70 @@ msgstr ""
 "pouลพijte:\n"
 "bzr branch %s\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pล™eskakuji dล™รญve staลพenรฝ soubor โ€ž%sโ€œ\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemรกte dostatek volnรฉho mรญsta"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potล™ebuji stรกhnout %sB/%sB zdrojovรฝch archivลฏ.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potล™ebuji stรกhnout %sB zdrojovรฝch archivลฏ.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Staลพenรญ zdroje %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Staลพenรญ nฤ›kterรฝch archivลฏ selhalo."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pล™eskakuji rozbalenรญ jiลพ rozbalenรฉho zdroje v %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Pล™รญkaz pro rozbalenรญ โ€ž%sโ€œ selhal.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Zkontrolujte, zda je nainstalovรกn balรญฤek โ€ždpkg-devโ€œ.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Pล™รญkaz pro sestavenรญ โ€ž%sโ€œ selhal.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Synovskรฝ proces selhal"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musรญte zadat alespoลˆ jeden balรญk, pro kterรฝ budou kontrolovรกny zรกvislosti "
 "pro sestavenรญ"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -950,17 +958,17 @@ msgstr ""
 "O architektuล™e %s nejsou znรกmy ลพรกdnรฉ informace. Pro nastavenรญ si pล™eฤtฤ›te "
 "ฤรกst APT::Architectures v manuรกlovรฉ strรกnce apt.conf(5)"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nelze zรญskat zรกvislosti pro sestavenรญ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemรก ลพรกdnรฉ zรกvislosti pro sestavenรญ.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -969,20 +977,20 @@ msgstr ""
 "zรกvislost %s pro %s nemลฏลพe bรฝt splnฤ›na, protoลพe %s nenรญ na balรญcรญch โ€ž%sโ€œ "
 "dovolena"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "zรกvislost %s pro %s nemลฏลพe bรฝt splnฤ›na, protoลพe balรญk %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnฤ›nรญ zรกvislosti %s pro %s: Instalovanรฝ balรญk %s je pล™รญliลก novรฝ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -991,7 +999,7 @@ msgstr ""
 "zรกvislost %s pro %s nemลฏลพe bรฝt splnฤ›na, protoลพe kandidรกtskรก verze balรญku %s "
 "nesplลˆuje poลพadavek na verzi"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1000,30 +1008,30 @@ msgstr ""
 "zรกvislost %s pro %s nemลฏลพe bรฝt splnฤ›na, protoลพe balรญk %s nemรก kandidรกtskou "
 "verzi"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnฤ›nรญ zรกvislosti %s pro %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Zรกvislosti pro sestavenรญ %s nemohly bรฝt splnฤ›ny."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Chyba pล™i zpracovรกnรญ zรกvislostรญ pro sestavenรญ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Seznam zmฤ›n %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Podporovanรฉ moduly:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1110,7 +1118,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT mรก schopnosti svatรฉ krรกvy.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1185,7 +1193,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s jiลพ nebyl drลพen v aktuรกlnรญ verzi.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ฤŒekal jsem na %s, ale nebyl tam"
@@ -1341,8 +1350,8 @@ msgstr "ฤŒas spojenรญ vyprลกel"
 msgid "Server closed the connection"
 msgstr "Server uzavล™el spojenรญ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Chyba ฤtenรญ"
 
@@ -1355,8 +1364,8 @@ msgid "Protocol corruption"
 msgstr "Poruลกenรญ protokolu"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Chyba zรกpisu"
 
@@ -1410,7 +1419,7 @@ msgstr "Spojenรญ datovรฉho socketu vyprลกelo"
 msgid "Unable to accept connection"
 msgstr "Nelze pล™ijmout spojenรญ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problรฉm s kontrolnรญm souฤtem souboru"
 
@@ -1437,85 +1446,98 @@ msgstr "Dotaz"
 msgid "Unable to invoke "
 msgstr "Nelze vyvolat "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Pล™ipojuji se k %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nelze vytvoล™it socket pro %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nelze navรกzat spojenรญ na %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nelze se pล™ipojit k %s:%s (%s), ฤas spojenรญ vyprลกel"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nelze se pล™ipojit k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pล™ipojuji se k %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nelze pล™eloลพit โ€ž%sโ€œ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Doฤasnรฉ selhรกnรญ pล™i zjiลกลฅovรกnรญ โ€ž%sโ€œ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Nฤ›co hodnฤ› oลกklivรฉho se pล™ihodilo pล™i pล™ekladu โ€ž%s:%sโ€œ (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Nฤ›co hodnฤ› oลกklivรฉho se pล™ihodilo pล™i pล™ekladu โ€ž%s:%sโ€œ (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nelze se pล™ipojit k %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnitล™nรญ chyba: Dobrรฝ podpis, ale nemohu zjistit otisk klรญฤe?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenรกn nejmรฉnฤ› jeden neplatnรฝ podpis. "
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nelze spustit โ€žgpgvโ€œ pro ovฤ›ล™enรญ podpisu (je gpgv nainstalovรกno?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Neznรกmรก chyba pล™i spouลกtฤ›nรญ gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Nรกsledujรญcรญ podpisy jsou neplatnรฉ:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1555,53 +1577,53 @@ msgstr "Tento HTTP server mรก porouchanou podporu rozsahลฏ"
 msgid "Unknown date format"
 msgstr "Neznรกmรฝ formรกt data"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Vรฝbฤ›r selhal"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ฤŒas spojenรญ vyprลกel"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Chyba zรกpisu do vรฝstupnรญho souboru"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Chyba zรกpisu do souboru"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Chyba zรกpisu do souboru"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba ฤtenรญ ze serveru. Druhรก strana zavล™ela spojenรญ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Chyba ฤtenรญ ze serveru"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ล patnรฉ datovรฉ zรกhlavรญ"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Spojenรญ selhalo"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Vnitล™nรญ chyba"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nelze ฤรญst %s"
@@ -1628,7 +1650,12 @@ msgstr "Soubor se zrcadly โ€ž%sโ€œ nebyl nalezen "
 msgid "Can not read mirror file '%s'"
 msgstr "Nelze ฤรญst soubor se zrcadly โ€ž%sโ€œ"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nelze ฤรญst soubor se zrcadly โ€ž%sโ€œ"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Zrcadlo: %s]"
@@ -1721,7 +1748,7 @@ msgstr ""
 "  -c=? Naฤte tento konfiguraฤnรญ soubor\n"
 "  -o=? Nastavรญ libovolnou volbu, napล™. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nelze zapsat do %s"
@@ -1866,8 +1893,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nelze otevล™รญt DB soubor %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nelze vyhodnotit %s"
@@ -1880,87 +1907,87 @@ msgstr "Archiv nemรก kontrolnรญ zรกznam"
 msgid "Unable to get a cursor"
 msgstr "Nelze zรญskat kurzor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Nelze ฤรญst adresรกล™ %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Nelze vyhodnotit %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Chyby se tรฝkajรญ souboru "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Chyba pล™i zjiลกลฅovรกnรญ %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Prลฏchod stromem selhal"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nelze otevล™รญt %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "Odlinkovรกnรญ %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nelze pล™eฤรญst link %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nelze odlinkovat %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nezdaล™ilo se slinkovat %s s %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Odlinkovacรญ limit %sB dosaลพen.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archiv nemรก pole Package"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemรก ลพรกdnou poloลพku pro override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  sprรกvce %s je %s, ne %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemรก ลพรกdnou zdrojovou poloลพku pro override\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemรก ani ลพรกdnou binรกrnรญ poloลพku pro override\n"
@@ -2034,7 +2061,7 @@ msgstr "Chyba ฤtenรญ pล™i vรฝpoฤtu MD5"
 msgid "Problem unlinking %s"
 msgstr "Problรฉm s odlinkovรกnรญm %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Selhalo pล™ejmenovรกnรญ %s na %s"
@@ -2091,23 +2118,23 @@ msgstr ""
 "  -c=? Naฤte tento konfiguraฤnรญ soubor\n"
 "  -o=? Nastavรญ libovolnou volbu, napล™. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Selhalo vytvoล™enรญ roury"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Selhalo spuลกtฤ›nรญ gzipu "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Poruลกenรฝ archiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Kontrolnรญ souฤet taru selhal, archiv je poลกkozenรฝ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznรกmรก hlaviฤka TARu typ %u, ฤlen %s"
@@ -2178,54 +2205,54 @@ msgstr "Selhal zรกpis souboru %s"
 msgid "Failed to close file %s"
 msgstr "Selhalo zavล™enรญ souboru %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Cesta %s je pล™รญliลก dlouhรก"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Rozbaluji %s vรญcekrรกt"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Adresรกล™ %s je odklonฤ›n"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Balรญk se pokouลกรญ zapisovat do diverznรญho cรญle %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Diverznรญ cesta je pล™รญliลก dlouhรก"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Adresรกล™ %s bude nahrazen neadresรกล™em"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nelze nalรฉzt uzel v jeho hashovacรญm kbelรญku"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Cesta je pล™รญliลก dlouhรก"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pล™epsat vyhovujรญcรญ balรญk bez udรกnรญ verze pro %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Soubor %s/%s pล™episuje ten z balรญku %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nelze vyhodnotit %s"
@@ -2305,30 +2332,30 @@ msgstr ""
 "zakรกzรกno."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Vรฝbฤ›r %s nenalezen"
@@ -2401,6 +2428,16 @@ msgstr "%c%sโ€ฆ Chyba!"
 msgid "%c%s... Done"
 msgstr "%c%sโ€ฆ Hotovo"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "โ€ฆ"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%sโ€ฆ %u%%"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2461,114 +2498,120 @@ msgstr "Nezdaล™ilo se vyhodnotit cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "Problรฉm pล™i zavรญrรกnรญ gzip souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nepouลพรญvรกm zamykรกnรญ pro zรกmkovรฝ soubor %s, kterรฝ je pouze pro ฤtenรญ"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Neลกlo otevล™รญt zรกmkovรฝ soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nepouลพรญvรกm zamykรกnรญ pro zรกmkovรฝ soubor %s pล™ipojenรฝ pล™es nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nelze zรญskat zรกmek %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "Seznam souborลฏ nelze vytvoล™it, jelikoลพ โ€ž%sโ€œ nenรญ adresรกล™"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignoruji โ€ž%sโ€œ v adresรกล™i โ€ž%sโ€œ, jelikoลพ to nenรญ obyฤejnรฝ soubor"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ignoruji soubor โ€ž%sโ€œ v adresรกล™i โ€ž%sโ€œ, jelikoลพ nemรก pล™รญponu"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "Ignoruji soubor โ€ž%sโ€œ v adresรกล™i โ€ž%sโ€œ, jelikoลพ mรก neplatnou pล™รญponu"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdrลพel chybu segmentace."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s obdrลพel signรกl %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrรกtil chybovรฝ kรณd (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neoฤekรกvanฤ› skonฤil"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nelze otevล™รญt soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nelze otevล™รญt popisovaฤ souboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Nelze vytvoล™it podproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Nezdaล™ilo se spustit kompresor "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "ฤtenรญ, stรกle mรกm k pล™eฤtenรญ %llu, ale uลพ nic nezbรฝvรก"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "zรกpis, stรกle mรกm %llu k zรกpisu, ale nejde to"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problรฉm pล™i zavรญrรกnรญ souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problรฉm pล™i pล™ejmenovรกnรญ souboru %s na %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problรฉm pล™i odstraลˆovรกnรญ souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problรฉm pล™i synchronizovรกnรญ souboru"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nenรญ nainstalovรกna ลพรกdnรก klรญฤenka."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache balรญkลฏ je prรกzdnรก"
@@ -2594,59 +2637,59 @@ msgstr "Tato APT nepodporuje systรฉm pro sprรกvu verzรญ โ€ž%sโ€œ"
 msgid "The package cache was built for a different architecture"
 msgstr "Cache balรญkลฏ byla vytvoล™ena pro jinou architekturu"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Zรกvisรญ na"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Pล™edzรกvisรญ na"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Doporuฤuje"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Zastarรกvรก"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Poruลกuje"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Rozลกiล™uje"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "dลฏleลพitรฝ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "vyลพadovanรฝ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standardnรญ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "volitelnรฝ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2746,17 +2789,17 @@ msgstr "Otevรญrรกm %s"
 msgid "Line %u too long in source list %s."
 msgstr "ล˜รกdek %u v seznamu zdrojลฏ %s je pล™รญliลก dlouhรฝ."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Zkomolenรฝ ล™รกdek %u v seznamu zdrojลฏ %s (typ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ โ€ž%sโ€œ na ล™รกdce %u v seznamu zdrojลฏ %s nenรญ znรกmรฝ"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2765,12 +2808,12 @@ msgstr ""
 "Nelze spustit okamลพitou konfiguraci balรญku โ€ž%sโ€œ. Podrobnosti naleznete v man "
 "5 apt.conf v ฤรกsti APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nelze nastavit โ€ž%sโ€œ."
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2792,7 +2835,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Balรญk %s je potล™eba pล™einstalovat, ale nemohu pro nฤ›j nalรฉzt archiv."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2800,11 +2843,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytvรกล™รญ poruchy, to mลฏลพe bรฝt zpลฏsobeno "
 "podrลพenรฝmi balรญky."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nelze opravit problรฉmy, nฤ›kterรฉ balรญky drลพรญte v porouchanรฉm stavu."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2812,7 +2855,7 @@ msgstr ""
 "Nฤ›kterรฉ indexovรฉ soubory se nepodaล™ilo stรกhnout. Jsou ignorovรกny, nebo jsou "
 "pouลพity starลกรญ verze."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Adresรกล™ seznamลฏ %spartial chybรญ."
@@ -2849,17 +2892,17 @@ msgstr "Ovladaฤ metody %s nemohl bรฝt nalezen."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nebyla spuลกtฤ›na sprรกvnฤ›"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vloลพte prosรญm disk nazvanรฝ โ€ž%sโ€œ do mechaniky โ€ž%sโ€œ a stisknฤ›te enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Balรญฤkovacรญ systรฉm โ€ž%sโ€œ nenรญ podporovรกn"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nebylo moลพno urฤit vhodnรฝ typ balรญฤkovacรญho systรฉmu"
 
@@ -2915,14 +2958,14 @@ msgstr "Cache mรก nekompatibilnรญ systรฉm sprรกvy verzรญ"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Chyba pล™i zpracovรกnรญ %s (%s%d)"
@@ -2943,26 +2986,26 @@ msgstr "Wow, pล™ekroฤili jste poฤet popisลฏ, kterรฉ tato APT umรญ zpracovat."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, pล™ekroฤili jste poฤet zรกvislostรญ, kterรฉ tato APT umรญ zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pล™i zpracovรกnรญ zรกvislostรญ nebyl nalezen balรญk %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Neลกlo vyhodnotit seznam zdrojovรฝch balรญkลฏ %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ฤŒtu seznamy balรญkลฏ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Chyba IO pล™i uklรกdรกnรญ zdrojovรฉ cache"
 
@@ -2975,12 +3018,12 @@ msgstr "pล™ejmenovรกnรญ selhalo, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Neshoda MD5 souฤtลฏ"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Neshoda kontrolnรญch souฤtลฏ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2989,16 +3032,16 @@ msgstr ""
 "V souboru Release nelze najรญt oฤekรกvanou poloลพku โ€ž%sโ€œ (chybnรฝ sources.list "
 "nebo poruลกenรฝ soubor)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "V souboru Release nelze najรญt kontrolnรญ souฤet โ€ž%sโ€œ"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "K nรกsledujรญcรญm ID klรญฤลฏ nenรญ dostupnรฝ veล™ejnรฝ klรญฤ:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3007,27 +3050,27 @@ msgstr ""
 "Soubor Release pro %s jiลพ expiroval (neplatnรฝ od %s). Aktualizace z tohoto "
 "repositรกล™e se nepouลพijรญ."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktnรญ distribuce: %s (oฤekรกvรกno %s, obdrลพeno %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Pล™i ovฤ›ล™ovรกnรญ podpisลฏ se objevila chyba. Repositรกล™ nenรญ aktualizovanรฝ, tudรญลพ "
 "se pouลพijรญ pล™edchozรญ indexovรฉ soubory. Chyba GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3036,7 +3079,7 @@ msgstr ""
 "Nebylo moลพnรฉ nalรฉzt soubor s balรญkem %s. To by mohlo znamenat, ลพe tento "
 "balรญk je tล™eba opravit ruฤnฤ› (kvลฏli chybฤ›jรญcรญ architektuล™e)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3045,38 +3088,38 @@ msgstr ""
 "Nebylo moลพnรฉ nalรฉzt soubor s balรญkem %s. Asi budete muset tento balรญk "
 "opravit ruฤnฤ›."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Indexovรฉ soubory balรญku jsou naruลกeny. Chybรญ pole Filename: u balรญku %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasรญ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nelze zpracovat Release soubor %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Release soubor %s neobsahuje ลพรกdnรฉ sekce"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Release soubor %s neobsahuje Hash zรกznam"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Neplatnรก poloลพka โ€žValid-Untilโ€œ v Release souboru %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Neplatnรก poloลพka โ€žDateโ€œ v Release souboru %s"
@@ -3104,7 +3147,7 @@ msgstr "Rozpoznรกvรกmโ€ฆ "
 msgid "Stored label: %s\n"
 msgstr "Uloลพenรฝ nรกzev: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Odpojuji CD-ROMโ€ฆ\n"
 
@@ -3168,30 +3211,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopรญruji seznamy balรญkลฏโ€ฆ"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Zapisuji novรฝ seznam balรญkลฏ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Seznamy zdrojลฏ na tomto disku jsou:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapsรกno %i zรกznamลฏ.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapsรกno %i zรกznamลฏ s chybฤ›jรญcรญmi soubory (%i).\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapsรกno %i zรกznamลฏ s nesouhlasรญcรญmi soubory (%i).\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapsรกno %i zรกznamลฏ s chybฤ›jรญcรญmi (%i) a nesouhlasรญcรญmi (%i) soubory.\n"
@@ -3206,17 +3249,6 @@ msgstr "Nelze najรญt autentizaฤnรญ zรกznam pro: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Neshoda kontrolnรญch souฤtลฏ pro: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Soubor %s nezaฤรญnรก podpisem"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nenรญ nainstalovรกna ลพรกdnรก klรญฤenka."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3282,114 +3314,114 @@ msgstr "Pล™รญprava na obdrลพenรญ ล™eลกenรญ"
 msgid "External solver failed without a proper error message"
 msgstr "Externรญ ล™eลกitel selhal, aniลพ by zanechal rozumnou chybovou hlรกลกku"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Spuลกtฤ›nรญ externรญho ล™eลกitele"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Instaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraลˆuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Kompletnฤ› odstraลˆuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Znaฤรญm si zmizenรญ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Spouลกtรญm poinstalaฤnรญ spouลกtฤ›ฤ %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresรกล™ โ€ž%sโ€œ chybรญ"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nelze otevล™รญt soubor โ€ž%sโ€œ"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Pล™ipravuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pล™ipravuji nastavenรญ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalovรกn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pล™ipravuji odstranฤ›nรญ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Odstranฤ›n %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pล™ipravuji รบplnรฉ odstranฤ›nรญ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletnฤ› odstranฤ›n %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Nelze zapsat log, volรกnรญ openpty() selhalo (/dev/pts nenรญ pล™ipojen?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Spouลกtรญm dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Operace byla pล™eruลกena dล™รญve, neลพ mohla skonฤit"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "ลฝรกdnรฉ apport hlรกลกenรญ nebylo vytvoล™eno, protoลพe jiลพ byl dosaลพen MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problรฉmy se zรกvislostmi - ponechรกvรกm nezkonfigurovanรฉ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3397,7 +3429,7 @@ msgstr ""
 "ลฝรกdnรฉ apport hlรกลกenรญ nebylo vytvoล™eno, protoลพe chybovรก hlรกลกka naznaฤuje, ลพe "
 "se jednรก o chybu zpลฏsobenou pล™edchozรญ chybou."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3413,13 +3445,7 @@ msgstr ""
 "ลฝรกdnรฉ apport hlรกลกenรญ nebylo vytvoล™eno, protoลพe chybovรก hlรกลกka naznaฤuje, ลพe "
 "je chyba zpลฏsobena zcela zaplnฤ›nou pamฤ›tรญ."
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3450,22 +3476,8 @@ msgstr "dpkg byl pล™eruลกen, pro nรกpravu problรฉmu musรญte ruฤnฤ› spustit โ€ž%
 msgid "Not locked"
 msgstr "Nenรญ uzamฤen"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Nฤ›co hodnฤ› oลกklivรฉho se pล™ihodilo pล™i pล™ekladu โ€ž%s:%sโ€œ (%i - %s)"
-
-#~ msgid "..."
-#~ msgstr "โ€ฆ"
-
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%sโ€ฆ %u%%"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Pล™i ovฤ›ล™ovรกnรญ podpisลฏ se objevila chyba. Repositรกล™ nenรญ aktualizovanรฝ, "
-#~ "tudรญลพ se pouลพijรญ pล™edchozรญ indexovรฉ soubory. Chyba GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Soubor %s nezaฤรญnรก podpisem"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Pล™eskakuji neexistujรญcรญ soubor %s"
diff --git a/po/cy.po b/po/cy.po
index e23ab97a5..ad7023047 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -109,77 +109,77 @@ msgstr "Cyfanswm Gofod Cyfrifwyd: "
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -252,11 +252,19 @@ msgstr ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -264,12 +272,12 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Methwyd ailenwi %s at %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -511,7 +519,7 @@ msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
@@ -622,8 +630,8 @@ msgstr "Ar รดl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ar รดl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -663,7 +671,7 @@ msgstr "Erthylu."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
@@ -672,7 +680,7 @@ msgstr "Methwyd cyrchu %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
@@ -751,7 +759,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
@@ -803,7 +811,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -815,87 +823,87 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -903,86 +911,86 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -991,7 +999,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1000,14 +1008,14 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1016,7 +1024,7 @@ msgstr ""
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1025,32 +1033,32 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1137,7 +1145,7 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bลตerau buwch hudol.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1208,7 +1216,8 @@ msgid "%s was already not hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -1351,8 +1360,8 @@ msgstr "Goramser cysylltu"
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Gwall darllen"
 
@@ -1365,8 +1374,8 @@ msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 
@@ -1422,7 +1431,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
@@ -1450,86 +1459,99 @@ msgstr "Ymholiad"
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Methwyd cysylltu i %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Methwyd datrys '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1571,55 +1593,55 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 #, fuzzy
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
@@ -1646,7 +1668,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1743,7 +1770,7 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad hwn\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni ellir ysgrifennu i %s"
@@ -1889,8 +1916,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni ellir agor y ffeil DB2 %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
@@ -1903,88 +1930,88 @@ msgstr "Does dim cofnod rheoli gan yr archif"
 msgid "Unable to get a cursor"
 msgstr "Ni ellir cael cyrchydd"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Rh: Ni ellir gwneud stat() o %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "G: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "Rh: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Methwyd datrys %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Methwyd cerdded y goeden"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Methwyd agor %s"
 
 # FIXME
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DatGysylltu %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Methwyd darllen y cyswllt %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Methwyd datgysylltu %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Methwyd cysylltu %s at %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
@@ -2059,7 +2086,7 @@ msgstr "Methwyd darllen wrth gyfrifo MD5"
 msgid "Problem unlinking %s"
 msgstr "Gwall wrth datgysylltu %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
@@ -2119,24 +2146,24 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad hwn\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Methwyd creu pibau"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Methwyd gweithredu gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Archif llygredig"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 #, fuzzy
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Methodd swm gwirio Tar, archif llygredig"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Math pennawd TAR anhysbys %u, aelod %s"
@@ -2209,56 +2236,56 @@ msgstr "Methwyd ysgrifennu ffeil %s"
 msgid "Failed to close file %s"
 msgstr "Methwyd cau ffeil %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Mae'r llwybr %s yn rhy hir"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Yn dadbacio %s mwy nag unwaith"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Methwyd lleoli nรดd yn ei fwced stwnsh"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Mae'r llwybr yn rhy hir"
 
 # FIXME: wtf?
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni ellir gwneud stat() o %s"
@@ -2339,30 +2366,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
@@ -2435,6 +2462,16 @@ msgstr "%c%s... Gwall!"
 msgid "%c%s... Done"
 msgstr "%c%s... Wedi Gorffen"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"
+
 # FIXME
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
@@ -2497,116 +2534,122 @@ msgstr "Methwyd gwneud stat() o'r CD-ROM"
 msgid "Problem closing the gzip file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Methwyd agor y ffeil clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Methwyd cael y clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gรดd gwall (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Methwyd creu isbroses IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Methwyd gweithredu cywasgydd "
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar รดl"
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
@@ -2634,59 +2677,59 @@ msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Dibynnu"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Awgrymu"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Argymell"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Amnewid"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Darfodi"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "pwysig"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "angenrheidiol"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "safonnol"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opsiynnol"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ychwanegol"
 
@@ -2796,30 +2839,30 @@ msgstr "Yn agor %s"
 msgid "Line %u too long in source list %s."
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Methwyd agor ffeil %s"
 
 # FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2843,7 +2886,7 @@ msgstr ""
 "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
 "ei gyfer."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2851,12 +2894,12 @@ msgstr ""
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2865,7 +2908,7 @@ msgstr ""
 "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
 "rai eu defnyddio yn lle."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
@@ -2902,7 +2945,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2910,12 +2953,12 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
@@ -2972,14 +3015,14 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
@@ -3003,27 +3046,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 #, fuzzy
 msgid "Reading package lists"
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Yn Casglu Darpariaethau Ffeil"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 
@@ -3036,13 +3079,13 @@ msgstr "methwyd ailenwi, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3050,42 +3093,42 @@ msgid ""
 msgstr ""
 
 # FIXME: number?
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3094,7 +3137,7 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3103,40 +3146,40 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
 # FIXME: number?
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 
 # FIXME: number?
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
@@ -3162,7 +3205,7 @@ msgstr ""
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD Anghywir"
@@ -3223,31 +3266,31 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3262,17 +3305,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3336,119 +3368,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3460,13 +3492,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3496,14 +3522,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Wedi Gorffen"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Yn agor y ffeil cyfluniad %s"
 
diff --git a/po/da.po b/po/da.po
index 898fa6d5d..7a71876aa 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-07-03 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -98,75 +98,75 @@ msgstr "Total plads, der kan gรธres rede for: "
 msgid "Package file %s is out of sync."
 msgstr "Pakkefilen %s er ude af trit."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Fandt ingen pakker"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Du skal angive mindst รฉt sรธgemรธnster"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Denne kommando er forรฆldet. Brug venligst ยปapt-mark showautoยซ i stedet for."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunne ikke lokalisere pakken %s"
 
 # Overskriften til apt-cache policy,
 # forkorter "Package" vรฆk. CH
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ยปPinnedยซ pakker:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompileret pรฅ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,21 +236,29 @@ msgstr ""
 "  -o=? Angiv et opsรฆtningstilvalg. F.eks. -o dir::cache=/tmp\n"
 "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Angiv venligst et navn for denne disk, som f.eks. ยปDebian 5.0.3 Disk 1ยซ"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Indsรฆt en disk i drevet og tryk retur"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Kunne ikke montere %s til %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gentag processen for resten af cd'erne i dit sรฆt."
 
@@ -488,7 +496,7 @@ msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s er i forvejen den nyeste version.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
@@ -595,8 +603,8 @@ msgstr "Efter denne handling, vil %sB yderligere diskplads vรฆre brugt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -635,7 +643,7 @@ msgstr "Afbryder."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsรฆtte [J/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
@@ -644,7 +652,7 @@ msgstr "Kunne ikke hente %s %s\n"
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 
@@ -730,7 +738,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Fรธlgende oplysninger kan hjรฆlpe dig med at klare situationen:"
 
@@ -780,7 +788,7 @@ msgstr ""
 "Uopfyldte afhรฆngigheder. Prรธv 'apt-get -f install' uden pakker (eller angiv "
 "en lรธsning)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -791,33 +799,33 @@ msgstr ""
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilgรฆngelige."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ร˜delagte pakker"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Fรธlgende yderligere pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Foreslรฅede pakker:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s sat til automatisk installation.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -825,46 +833,46 @@ msgstr ""
 "Denne kommando er forรฆldet. Brug venligst ยปapt-mark autoยซ og ยปapt-mark "
 "manualยซ i stedet for."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Fรฆrdig"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemlรธseren รธdelagde noget"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke lรฅse nedhentningsmappen"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Kan ikke finde en kilde til at hente version ยป%sยซ for ยป%sยซ"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Henter %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du skal angive mindst รฉn pakke at hente kildeteksten til"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -873,7 +881,7 @@ msgstr ""
 "BEMร†RK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' pรฅ:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -884,68 +892,68 @@ msgstr ""
 "bzr branch %s\n"
 "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plads i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Skal angive mindst รฉn pakke at tjekke opbygningsafhรฆngigheder for"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -954,17 +962,17 @@ msgstr ""
 "Ingen arkitekturinformation tilgรฆngelig for %s. Se apt.conf(5) APT::"
 "Architectures for opsรฆtning"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunne ikke hente oplysninger om opbygningsafhรฆngigheder for %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhรฆngigheder.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -972,7 +980,7 @@ msgid ""
 msgstr ""
 "Afhรฆngigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt pรฅ '%s'"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -980,14 +988,14 @@ msgid ""
 msgstr ""
 "Afhรฆngigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Kunne ikke opfylde %s-afhรฆngigheden for %s: Den installerede pakke %s er for "
 "ny"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -996,7 +1004,7 @@ msgstr ""
 "Afhรฆngigheden %s for %s kan ikke opfyldes, da ingen af de tilgรฆngelige "
 "kandidater for pakken %s kan tilfredsstille versionskravene"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1005,30 +1013,30 @@ msgstr ""
 "%s-afhรฆngigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
 "kandidatversion"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Kunne ikke opfylde %s-afhรฆngigheden for %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhรฆngigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhรฆngighederne"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ร†ndringslog for %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Understรธttede moduler:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1116,7 +1124,7 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har ยปSuper Cow Powersยซ.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1191,7 +1199,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s var allerede ikke i bero.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede pรฅ %s, men den var der ikke"
@@ -1349,8 +1358,8 @@ msgstr "Tidsudlรธb pรฅ forbindelsen"
 msgid "Server closed the connection"
 msgstr "Serveren lukkede forbindelsen"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lรฆsefejl"
 
@@ -1363,8 +1372,8 @@ msgid "Protocol corruption"
 msgstr "Protokolfejl"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Skrivefejl"
 
@@ -1418,7 +1427,7 @@ msgstr "Tidsudlรธb pรฅ datasokkel-forbindelse"
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1445,87 +1454,100 @@ msgstr "Forespรธrgsel"
 msgid "Unable to invoke "
 msgstr "Kunne ikke udfรธre "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Forbinder til %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudlรธb"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunne ikke forbinde til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbinder til %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunne ikke omsรฆtte navnet '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig fejl ved omsรฆtning af navnet '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Der skete noget underligt under oplรธsning af '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Der skete noget underligt under oplรธsning af '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunne ikke forbinde til %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Intern fejl: Gyldig signatur, men kunne ikke afgรธre nรธgle-fingeraftryk?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Stรธdte pรฅ mindst รฉn ugyldig signatur."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunne ikke kรธre 'gpgv' for at verificere signaturen (er gpgv installeret?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved kรธrsel af gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Fรธlgende signaturer var ugyldige:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1566,53 +1588,53 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Tidsudlรธb pรฅ forbindelsen"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved lรฆsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Fejl ved lรฆsning fra server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Intern fejl"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke lรฆse %s"
@@ -1639,7 +1661,12 @@ msgstr "Ingen spejlfil ยป%sยซ fundet "
 msgid "Can not read mirror file '%s'"
 msgstr "Kan ikke lรฆse spejlfil ยป%sยซ"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Kan ikke lรฆse spejlfil ยป%sยซ"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spejl: %s]"
@@ -1738,7 +1765,7 @@ msgstr ""
 "  -c=? Lรฆs denne opsรฆtningsfil\n"
 "  -o=? Angiv et opsรฆtningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunne ikke skrive til %s"
@@ -1883,8 +1910,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Kunne ikke รฅbne DB-filen %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Kunne ikke finde %s"
@@ -1897,87 +1924,87 @@ msgstr "Arkivet har ingen kontrolindgang"
 msgid "Unable to get a cursor"
 msgstr "Kunne skaffe en markรธr"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Kunne ikke lรฆse mappen %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Kunne ikke finde %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "F: Fejlene vedrรธrer filen "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Kunne ikke omsรฆtte navnet %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Trรฆvandring mislykkedes"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Kunne ikke รฅbne %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Kunne ikke ยปreadlinkยซ %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Kunne ikke frigรธre %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Kunne ikke lรฆnke %s til %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Nรฅede DeLink-begrรฆnsningen pรฅ %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arkivet havde intet package-felt"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen tvangs-post\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen linje med tilsidesรฆttelse af standard for kildefiler\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -2052,7 +2079,7 @@ msgstr "Kunne ikke lรฆse under beregning af MD5"
 msgid "Problem unlinking %s"
 msgstr "Problem under aflรฆnkning af %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Kunne ikke omdรธbe %s til %s"
@@ -2110,23 +2137,23 @@ msgstr ""
 "  -c=? Lรฆs denne opsรฆtningsfil\n"
 "  -o=? Angiv en opsรฆtningsindstilling. F.eks. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Kunne ikke oprette viderefรธrsler"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Kunne ikke udfรธre gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ร˜delagt arkiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-tjeksum fejlede, arkivet er รธdelagt"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukendt TAR-hovedtype %u, element %s"
@@ -2197,54 +2224,54 @@ msgstr "Kunne ikke skrive filen %s"
 msgid "Failed to close file %s"
 msgstr "Kunne ikke lukke filen %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stien %s er for lang"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakkede %s ud flere gange"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mappen %s er omrokeret"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakken forsรธger at skrive til omrokeret mรฅl %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Omrokeringsstien er for lang"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Mappen %s bliver erstattet af en ikke-mappe"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Kunne ikke finde knuden i sin hash-bucket"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Stien er for lang"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Overskriv pakkematch uden version for %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s overskriver filen i pakken %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kunne ikke finde %s"
@@ -2328,30 +2355,30 @@ msgstr ""
 "bruger."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"
@@ -2421,6 +2448,16 @@ msgstr "%c%s... Fejl!"
 msgid "%c%s... Done"
 msgstr "%c%s... Fรฆrdig"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fรฆrdig"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2481,114 +2518,120 @@ msgstr "Kunne ikke finde cdrommen"
 msgid "Problem closing the gzip file %s"
 msgstr "Problem under lukning af gzip-filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Benytter ikke lรฅsning for skrivebeskyttet lรฅsefil %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunne ikke รฅbne lรฅsefilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Benytter ikke lรฅsning for nfs-monteret lรฅsefil %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunne ikke opnรฅ lรฅsen %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "Liste over filer kan ikke oprettes da ยป%sยซ ikke er en mappe"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignorerer ยป%sยซ i mappe ยป%sยซ da det ikke er en regulรฆr fil"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ignorerer fil ยป%sยซ i mappe ยป%sยซ da den ikke har en filendelse"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "Ignorerer fil ยป%sยซ i mappe ยป%sยซ da den har en ugyldig filendelse"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s modtog en segmenteringsfejl."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s modtog en signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s returnerede en fejlkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s afsluttedes uventet"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke รฅbne filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kunne ikke รฅbne filbeskrivelse %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Kunne ikke oprette underproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Kunne ikke udfรธre komprimeringsprogram "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lรฆs, mangler stadig at lรฆse %llu men der er ikke flere"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem under lukning af filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem under omdรธbning af filen %s til %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Fejl ved frigivelse af filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problem under synkronisering af fil"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nรธglering installeret i %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Tomt pakke-mellemlager"
@@ -2614,59 +2657,59 @@ msgstr "Denne APT understรธtter ikke versionssystemet '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Afhรฆngigheder"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Prรฆ-afhรฆngigheder"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Foreslรฅede"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Anbefalede"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Overflรธdiggรธr"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ร˜delรฆgger"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Forbedringer"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "vigtig"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "krรฆvet"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "frivillig"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ekstra"
 
@@ -2766,17 +2809,17 @@ msgstr "ร…bner %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linjen %u er for lang i kildelisten %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Ugyldig linje %u i kildelisten %s (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen '%s' er ukendt pรฅ linje %u i kildelisten %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2785,12 +2828,12 @@ msgstr ""
 "Kunne ikke udfรธre รธjeblikkelig konfiguration pรฅ ยป%sยซ. Se venligst man 5 apt."
 "conf under APT:Immediate-Cinfigure for detaljer. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Kunne ikke รฅbne filen ยป%sยซ. "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2814,7 +2857,7 @@ msgid ""
 msgstr ""
 "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2822,12 +2865,12 @@ msgstr ""
 "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
 "tilbageholdte pakker."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Kunne ikke korrigere problemerne, da du har tilbageholdt รธdelagte pakker."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2835,7 +2878,7 @@ msgstr ""
 "Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
 "bruges i stedet."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listemappen %spartial mangler."
@@ -2872,17 +2915,17 @@ msgstr "Metodedriveren %s blev ikke fundet."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Indsรฆt disken med navnet: '%s' i drevet '%s' og tryk retur."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet '%s' understรธttes ikke"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunne ikke bestemme en passende pakkesystemtype"
 
@@ -2937,14 +2980,14 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
@@ -2967,26 +3010,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Hold da op! Du nรฅede over det antal afhรฆngigheder, denne APT kan hรฅndtere."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhรฆngigheder"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunne ikke finde kildepakkelisten %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Indlรฆser pakkelisterne"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Samler filudbud"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO-fejl ved gemning af kilde-mellemlageret"
 
@@ -2999,12 +3042,12 @@ msgstr "omdรธbning mislykkedes, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hashsum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3013,17 +3056,17 @@ msgstr ""
 "Kunne ikke finde uventet punkt ยป%sยซ i udgivelsesfil (forkert sources.list-"
 "punkt eller forkert udformet fil)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kunne ikke finde hashsum for ยป%sยซ i udgivelsesfilen"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Der er ingen tilgรฆngelige offentlige nรธgler for fรธlgende nรธgle-ID'er:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3032,27 +3075,27 @@ msgstr ""
 "Udgivelsesfil for %s er udlรธbet (ugyldig siden %s). Opdateringer for dette "
 "arkiv vil ikke blive anvendt."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Der opstod en fejl under underskriftsbekrรฆftelse. Arkivet er ikke opdateret "
 "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fejl: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3104,7 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nรธdt til manuelt at reparere denne pakke. (grundet manglende arch)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3070,37 +3113,37 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nรธdt til manuelt at reparere denne pakke."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Stรธrrelsen stemmer ikke"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kunne ikke fortolke udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ingen afsnit i udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Intet hashpunkt i udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
@@ -3128,7 +3171,7 @@ msgstr "Identificerer.. "
 msgid "Stored label: %s\n"
 msgstr "Gemt mรฆrkat: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Afmonterer cdrom...\n"
 
@@ -3192,30 +3235,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelisterne..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Skriver ny kildeliste\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Denne disk har fรธlgende kildeliste-indgange:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i ikke-trufne filer\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
@@ -3230,17 +3273,6 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsum stemmer ikke: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Fil %s starter ikke med en ยปclearsignedยซ besked"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nรธglering installeret i %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3308,114 +3340,114 @@ msgstr "Forbered for modtagelse af lรธsning"
 msgid "External solver failed without a proper error message"
 msgstr "Ekstern problemlรธser fejlede uden en korrekt fejlbesked"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Kรธr ekstern problemlรธser"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Sรฆtter %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Bemรฆrker forsvinding af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kรธrer fรธrinstallationsudlรธser %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappe '%s' mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunne ikke รฅbne filen '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Klargรธr %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Gรธr klar til at sรฆtte %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Gรธr klar til afinstallation af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Gรธr klar til at fjerne %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Kรธrer dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Handling blev afbrudt fรธr den kunne afsluttes"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nรฅet"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "afhรฆngighedsproblemer - efterlader ukonfigureret"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3423,7 +3455,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
 "opfรธlgningsfejl fra en tidligere fejl."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3438,13 +3470,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
 "hukommelsesfejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
@@ -3474,20 +3500,8 @@ msgstr "dpkg blev afbrudt, du skal manuelt kรธre '%s' for at rette problemet."
 msgid "Not locked"
 msgstr "Ikke lรฅst"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Der skete noget underligt under oplรธsning af '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Fรฆrdig"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Der opstod en fejl under underskriftsbekrรฆftelse. Arkivet er ikke "
-#~ "opdateret og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Fil %s starter ikke med en ยปclearsignedยซ besked"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Springer ikkeeksisterende fil over %s"
diff --git a/po/de.po b/po/de.po
index 14c07b495..2635b26de 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-27 10:55+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -98,76 +98,76 @@ msgstr "Gesamtmenge an Speicher: "
 msgid "Package file %s is out of sync."
 msgstr "Paketdatei %s ist nicht synchronisiert."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Keine Pakete gefunden"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Sie mรผssen mindestens ein Suchmuster angeben"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Dieser Befehl ist รผberholt. Bitte verwenden Sie stattdessen ยปapt-mark "
 "showautoยซ."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Paket %s kann nicht gefunden werden."
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht "
 "mรถglich"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Mit Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Installationskandidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(keine)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s fรผr %s, kompiliert am %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,24 +238,32 @@ msgstr ""
 "Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n"
 "und apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Bitte geben Sie einen Namen fรผr dieses Medium an, wie zum Beispiel ยปDebian "
 "5.0.3 Disk 1ยซ"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 "Bitte legen Sie ein Medium in das Laufwerk ein und drรผcken Sie die "
 "Eingabetaste (Enter)."
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ยป%sยซ konnte nicht in ยป%sยซ eingebunden werden."
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "Wiederholen Sie dieses Prozedere fรผr die restlichen Disks Ihres Satzes."
@@ -499,7 +507,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
@@ -608,8 +616,8 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusรคtzlich benutzt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Freier Platz in %s konnte nicht bestimmt werden."
@@ -648,7 +656,7 @@ msgstr "Abbruch."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Mรถchten Sie fortfahren [J/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fehlschlag beim Holen von %s  %s\n"
@@ -657,7 +665,7 @@ msgstr "Fehlschlag beim Holen von %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
@@ -743,7 +751,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lรถsen:"
@@ -797,7 +805,7 @@ msgstr ""
 "Unerfรผllte Abhรคngigkeiten. Versuchen Sie ยปapt-get -f installยซ ohne Angabe "
 "eines Pakets (oder geben Sie eine Lรถsung an)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -809,33 +817,33 @@ msgstr ""
 "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
 "nicht erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Beschรคdigte Pakete"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusรคtzlichen Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s wurde als automatisch installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -843,50 +851,50 @@ msgstr ""
 "Dieser Befehl ist รผberholt. Bitte verwenden Sie stattdessen ยปapt-mark autoยซ "
 "und ยปapt-mark manualยซ."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Fertig"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problemlรถser hat etwas beschรคdigt."
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "Es konnte keine Quelle gefunden werden, um Version ยป%sยซ von ยป%sยซ "
 "herunterzuladen."
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Herunterladen von %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen."
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Quellpaket fรผr %s kann nicht gefunden werden."
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -896,7 +904,7 @@ msgstr ""
 "auf:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -908,70 +916,70 @@ msgstr ""
 "um die neuesten (mรถglicherweise noch unverรถffentlichten) Aktualisierungen\n"
 "fรผr das Paket abzurufen.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Bereits heruntergeladene Datei ยป%sยซ wird รผbersprungen.\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Sie haben nicht genรผgend freien Speicherplatz in %s."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es mรผssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es mรผssen %sB an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Quelle %s wird heruntergeladen.\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Das Entpacken der bereits entpackten Quelle in %s wird รผbersprungen.\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpackbefehl ยป%sยซ fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "รœberprรผfen Sie, ob das Paket ยปdpkg-devยซ installiert ist.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl ยป%sยซ fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Bauabhรคngigkeiten "
 "รผberprรผft werden sollen."
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -980,18 +988,18 @@ msgstr ""
 "Keine Architekturinformation fรผr %s verfรผgbar. Weiteres zur Einrichtung "
 "finden Sie unter apt.conf(5) APT::Architectures."
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bauabhรคngigkeiten fรผr %s konnten nicht gefunden werden."
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bauabhรคngigkeiten.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1000,7 +1008,7 @@ msgstr ""
 "ยป%sยซ-Abhรคngigkeit fรผr %s kann nicht erfรผllt werden, da %s bei ยป%sยซ-Paketen "
 "nicht erlaubt ist."
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1009,14 +1017,14 @@ msgstr ""
 "ยป%sยซ-Abhรคngigkeit fรผr %s kann nicht erfรผllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "ยป%sยซ-Abhรคngigkeit fรผr %s kann nicht erfรผllt werden: Installiertes Paket %s "
 "ist zu neu."
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1026,7 +1034,7 @@ msgstr ""
 "Installationskandidaten fรผr das Paket %s die Versionsanforderungen nicht "
 "erfรผllen kann."
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1035,30 +1043,30 @@ msgstr ""
 "ยป%sยซ-Abhรคngigkeit fรผr %s kann nicht erfรผllt werden, da fรผr Paket %s kein "
 "Installationskandidat existiert."
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ยป%sยซ-Abhรคngigkeit fรผr %s konnte nicht erfรผllt werden: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bauabhรคngigkeiten fรผr %s konnten nicht erfรผllt werden."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bauabhรคngigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ร„nderungsprotokoll (Changelog) fรผr %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Unterstรผtzte Module:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1153,7 +1161,7 @@ msgstr ""
 "bezรผglich weitergehender Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Krรคfte.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1230,7 +1238,8 @@ msgid "%s was already not hold.\n"
 msgstr "Die Halten-Markierung fรผr %s wurde bereits entfernt.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1391,8 +1400,8 @@ msgstr "Zeitรผberschreitung der Verbindung"
 msgid "Server closed the connection"
 msgstr "Verbindung durch Server geschlossen"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lesefehler"
 
@@ -1405,8 +1414,8 @@ msgid "Protocol corruption"
 msgstr "Protokoll beschรคdigt"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Schreibfehler"
 
@@ -1462,7 +1471,7 @@ msgstr "Zeitรผberschreitung bei Datenverbindungsaufbau"
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden."
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
 
@@ -1489,91 +1498,104 @@ msgstr "Abfrage"
 msgid "Unable to invoke "
 msgstr "Aufruf nicht mรถglich: "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Verbindung mit %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Socket fรผr %s konnte nicht erzeugt werden (f=%u t=%u p=%u)."
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
 "Zeitรผberschreitung trat auf."
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s nicht mรถglich (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbindung mit %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ยป%sยซ konnte nicht aufgelรถst werden."
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporรคrer Fehlschlag beim Auflรถsen von ยป%sยซ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Beim Auflรถsen von ยป%s:%sยซ ist etwas Schlimmes passiert (%i - %s)."
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Beim Auflรถsen von ยป%s:%sยซ ist etwas Schlimmes passiert (%i - %s)."
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Verbindung mit %s:%s nicht mรถglich:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interner Fehler: Gรผltige Signatur, Fingerabdruck des Schlรผssels konnte "
 "jedoch nicht ermittelt werden?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungรผltige Signatur wurde entdeckt."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "ยปgpgvยซ konnte zur รœberprรผfung der Signatur nicht ausgefรผhrt werden (ist gpgv "
 "installiert?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausfรผhren von gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungรผltig:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1617,55 +1639,55 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Zeitรผberschreitung bei Verbindung"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
 "anderen Seite geschlossen."
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Interner Fehler"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden."
@@ -1692,7 +1714,12 @@ msgstr "Keine Datei von Spiegelserver ยป%sยซ gefunden"
 msgid "Can not read mirror file '%s'"
 msgstr "Datei ยป%sยซ von Spiegelserver kann nicht gelesen werden."
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Datei ยป%sยซ von Spiegelserver kann nicht gelesen werden."
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spiegelserver: %s]"
@@ -1791,7 +1818,7 @@ msgstr ""
 "  -c=?  Diese Konfigurationsdatei lesen\n"
 "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Schreiben nach %s nicht mรถglich"
@@ -1945,8 +1972,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Datenbankdatei %s kann nicht geรถffnet werden: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s mit ยปstatยซ abfragen fehlgeschlagen"
@@ -1959,87 +1986,87 @@ msgstr "Archiv hat keinen Steuerungsdatensatz."
 msgid "Unable to get a cursor"
 msgstr "Unmรถglich, einen Cursor zu bekommen"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s mit ยปstatยซ abfragen nicht mรถglich.\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "F: Fehler gehรถren zu Datei "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s konnte nicht aufgelรถst werden."
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ร–ffnen von %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink von %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Entfernen (unlink) von %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Erzeugen einer Verknรผpfung von %s zu %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-Limit von %sB erreicht\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archiv hatte kein Feld ยปpackageยซ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-Betreuer ist %s und nicht %s.\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -2113,7 +2140,7 @@ msgstr "Lesevorgang wรคhrend der MD5-Berechnung fehlgeschlagen"
 msgid "Problem unlinking %s"
 msgstr "Problem beim Entfernen (unlink) von %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s konnte nicht in %s umbenannt werden."
@@ -2172,23 +2199,23 @@ msgstr ""
 "  -c=? Diese Konfigurationsdatei lesen\n"
 "  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "gzip konnte nicht ausgefรผhrt werden."
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Beschรคdigtes Archiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-Prรผfsumme fehlgeschlagen, Archiv beschรคdigt"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
@@ -2259,54 +2286,54 @@ msgstr "Datei %s konnte nicht geschrieben werden."
 msgid "Failed to close file %s"
 msgstr "Datei %s konnte nicht geschlossen werden."
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Der Pfad %s ist zu lang."
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s mehr als einmal entpackt"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Das Verzeichnis %s ist umgeleitet."
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Der Umleitungspfad ist zu lang."
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt."
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Knoten konnte nicht in seinem Hash gefunden werden."
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Der Pfad ist zu lang."
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pakettreffer ohne Version fรผr %s wird รผberschrieben."
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Durch die Datei %s/%s wird die Datei in Paket %s รผberschrieben."
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s mit ยปstatยซ abfragen nicht mรถglich"
@@ -2389,30 +2416,30 @@ msgstr ""
 "MMap vom Benutzer deaktiviert ist."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%li d %li h %li min %li s"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%li h %li min %li s"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%li min %li s"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"
@@ -2484,6 +2511,16 @@ msgstr "%c%s... Fehler!"
 msgid "%c%s... Done"
 msgstr "%c%s... Fertig"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fertig"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2545,45 +2582,45 @@ msgstr "CD-ROM mit ยปstatยซ abfragen fehlgeschlagen"
 msgid "Problem closing the gzip file %s"
 msgstr "Problem beim SchlieรŸen der gzip-Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Es wird keine Sperre fรผr schreibgeschรผtzte Sperrdatei %s verwendet."
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Sperrdatei %s konnte nicht geรถffnet werden."
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Es wird keine Sperre fรผr per NFS eingebundene Sperrdatei %s verwendet."
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Konnte Sperre %s nicht bekommen"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "Dateiliste kann nicht erstellt werden, da ยป%sยซ kein Verzeichnis ist."
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "ยป%sยซ in Verzeichnis ยป%sยซ wird ignoriert, da es keine regulรคre Datei ist."
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Datei ยป%sยซ in Verzeichnis ยป%sยซ wird ignoriert, da sie keine Dateinamen-"
 "Erweiterung hat."
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2591,77 +2628,83 @@ msgstr ""
 "Datei ยป%sยซ in Verzeichnis ยป%sยซ wird ignoriert, da sie eine ungรผltige "
 "Dateinamen-Erweiterung hat."
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Unterprozess %s hat das Signal %u empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Unterprozess %s hat Fehlercode zurรผckgegeben (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Unterprozess %s unerwartet beendet"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Datei %s konnte nicht geรถffnet werden."
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Datei-Deskriptor %d konnte nicht geรถffnet werden."
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr ""
 "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Fehler beim Ausfรผhren von Komprimierer "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 "Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr รผbrig."
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch "
 "nicht mรถglich."
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem beim SchlieรŸen der Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem beim Umbenennen der Datei %s nach %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem beim Entfernen (unlink) der Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problem beim Synchronisieren der Datei"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Kein Schlรผsselring in %s installiert"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Leerer Paketzwischenspeicher"
@@ -2688,59 +2731,59 @@ msgstr "Das Versionssystem ยป%sยซ wird durch dieses APT nicht unterstรผtzt."
 msgid "The package cache was built for a different architecture"
 msgstr "Der Paketzwischenspeicher wurde fรผr eine andere Architektur aufgebaut."
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Hรคngt ab von"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Hรคngt ab von (vorher)"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Schlรคgt vor"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Kollidiert mit"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Lรถst ab"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Beschรคdigt"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Wertet auf"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "wichtig"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "erforderlich"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2841,17 +2884,17 @@ msgstr "%s wird geรถffnet."
 msgid "Line %u too long in source list %s."
 msgstr "Zeile %u in Quellliste %s zu lang."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Missgestaltete Zeile %u in Quellliste %s (ยปtypeยซ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ ยป%sยซ in Zeile %u der Quellliste %s ist unbekannt."
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2860,12 +2903,12 @@ msgstr ""
 "ยป%sยซ konnte nicht unmittelbar konfiguriert werden. Lesen Sie ยปman 5 apt."
 "confยซ unter APT::Immediate-Configure bezรผglich weiterer Details. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "ยป%sยซ konnte nicht konfiguriert werden. "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2890,7 +2933,7 @@ msgstr ""
 "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafรผr "
 "gefunden werden."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2898,13 +2941,13 @@ msgstr ""
 "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
 "dies kรถnnte durch zurรผckgehaltene Pakete verursacht worden sein."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Probleme kรถnnen nicht korrigiert werden, Sie haben zurรผckgehaltene defekte "
 "Pakete."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2912,7 +2955,7 @@ msgstr ""
 "Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden "
 "ignoriert oder alte an ihrer Stelle benutzt."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listenverzeichnis %spartial fehlt."
@@ -2949,19 +2992,19 @@ msgstr "Der Treiber fรผr Methode %s konnte nicht gefunden werden."
 msgid "Method %s did not start correctly"
 msgstr "Methode %s ist nicht korrekt gestartet."
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Bitte legen Sie das Medium mit dem Namen ยป%sยซ in Laufwerk ยป%sยซ ein und "
 "drรผcken Sie die Eingabetaste (Enter)."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketierungssystem ยป%sยซ wird nicht unterstรผtzt."
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht mรถglich"
 
@@ -3021,14 +3064,14 @@ msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
@@ -3057,27 +3100,27 @@ msgstr ""
 "Na so was, Sie haben die Anzahl an Abhรคngigkeiten รผberschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Paket %s %s wurde beim Verarbeiten der Dateiabhรคngigkeiten nicht gefunden."
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Die Quellpaket-Liste %s konnte nicht mit ยปstatยซ abgefragt werden"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Paketlisten werden gelesen"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Sammeln der angebotenen Funktionalitรคten (Provides) aus den Dateien"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
 
@@ -3090,12 +3133,12 @@ msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5-Summe stimmt nicht รผberein"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash-Summe stimmt nicht รผberein"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3104,17 +3147,17 @@ msgstr ""
 "Erwarteter Eintrag ยป%sยซ konnte in Release-Datei nicht gefunden werden "
 "(falscher Eintrag in sources.list oder missgebildete Datei)."
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Hash-Summe fรผr ยป%sยซ kann in Release-Datei nicht gefunden werden."
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Es gibt keine รถffentlichen Schlรผssel fรผr die folgenden Schlรผssel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3123,15 +3166,15 @@ msgstr ""
 "Release-Datei fรผr %s ist abgelaufen (ungรผltig seit %s). Aktualisierungen fรผr "
 "dieses Depot werden nicht angewendet."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Wรคhrend der รœberprรผfung der Signatur trat ein Fehler auf. Das Repository "
@@ -3139,12 +3182,12 @@ msgstr ""
 "GPG-Fehler: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-Fehler: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3154,7 +3197,7 @@ msgstr ""
 "Sie dieses Paket von Hand korrigieren mรผssen (aufgrund fehlender "
 "Architektur)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3163,38 +3206,38 @@ msgstr ""
 "Es konnte keine Datei fรผr Paket %s gefunden werden. Das kรถnnte heiรŸen, dass "
 "Sie dieses Paket von Hand korrigieren mรผssen."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Die Paketindexdateien sind beschรคdigt: Kein Filename:-Feld fรผr Paket %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "GrรถรŸe stimmt nicht รผberein"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release-Datei %s kann nicht verarbeitet werden."
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Keine Bereiche (Sections) in Release-Datei %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Kein Hash-Eintrag in Release-Datei %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ungรผltiger ยปValid-Untilยซ-Eintrag in Release-Datei %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ungรผltiger ยปDateยซ-Eintrag in Release-Datei %s"
@@ -3222,7 +3265,7 @@ msgstr "Identifizieren ... "
 msgid "Stored label: %s\n"
 msgstr "Gespeicherte Kennzeichnung: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Einbindung der CD-ROM wird gelรถst ...\n"
 
@@ -3286,30 +3329,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopieren der Paketlisten ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Schreiben der neuen Quellliste\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Quelllisteneintrรคge fรผr dieses Medium sind:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Es wurden %i Datensรคtze geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Es wurden %i Datensรคtze mit %i fehlenden Dateien geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Es wurden %i Datensรคtze mit %i nicht passenden Dateien geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3326,17 +3369,6 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden fรผr: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-Summe stimmt nicht รผberein fรผr: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlรผsselring in %s installiert"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3411,117 +3443,117 @@ msgid "External solver failed without a proper error message"
 msgstr ""
 "Externer Problemlรถser ist ohne ordnungsgemรครŸe Fehlermeldung fehlgeschlagen."
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Externen Problemlรถser ausfรผhren"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s wird installiert."
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wird konfiguriert."
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt."
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wird vollstรคndig entfernt."
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Verschwinden von %s festgestellt"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Aufruf des Nach-Installations-Triggers %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis ยป%sยซ fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Datei ยป%sยซ konnte nicht geรถffnet werden."
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt."
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Entfernen von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Vollstรคndiges Entfernen von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollstรคndig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Schreiben des Protokolls nicht mรถglich, openpty() fehlgeschlagen (/dev/pts "
 "nicht eingebunden?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Ausfรผhren von dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
 "erreicht ist."
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "Abhรคngigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3529,7 +3561,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
 "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3545,15 +3577,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen erschรถpftem Arbeitsspeicher hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
-"erreicht ist"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3589,21 +3613,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Beim Auflรถsen von ยป%s:%sยซ ist etwas Schlimmes passiert (%i - %s)."
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Fertig"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Wรคhrend der รœberprรผfung der Signatur trat ein Fehler auf. Das Repository "
-#~ "wurde nicht aktualisiert und die vorherigen Indexdateien werden "
-#~ "verwendet. GPG-Fehler: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Nicht vorhandene Datei %s wird รผbersprungen."
diff --git a/po/dz.po b/po/dz.po
index 9e32fff07..fbe317285 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -100,74 +100,74 @@ msgstr "เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝขเพฉเฝฒเฝฆเผ‹เฝเฝผเผ‹เฝ–เฝเฝผเฝ“เผ‹เฝก
 msgid "Package file %s is out of sync."
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹ %sเฝ เฝ‘เฝฒเผ‹เฝ˜เฝ‰เฝ˜เผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝ‚เฝฒเผ‹เฝ•เพฑเฝฒเผ‹เฝเฝขเผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝšเฝดเผ‹เฝ˜เผ‹เฝเฝผเฝ–เผ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเฝฆเผ‹เฝเฝ‚เผ‹เฝเฝ‚เผ‹เฝฆเพฆเฝบเผ‹เฝ‘เฝ”เฝบเผ‹เฝ‚เฝžเฝฒเผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝ–เพฑเฝฒเฝ“เผ‹เฝ‘เฝ‚เฝผ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sเฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เผ‹เฝกเฝผเฝ‘เผ‹เฝŸเฝšเฝผเฝฃเผ‹เฝ˜เผ‹เฝเฝผเฝ–เผ"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เพฑเฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "เฝ เฝ‘เพฒเผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เฝ‰เฝ˜เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ‚เฝฒเผ‹เฝ•เพฑเฝฒเผ‹เฝเฝขเผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ‹  เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ…เฝฒเฝ‚เผ‹เฝฃเฝดเผ‹ เฝจเฝบเฝ‚เฝฆเฝฒเผ‹-เฝขเฝบเฝ•เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เฝฒเผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "เฝเฝ–เผ‹เฝ‚เฝŸเฝบเฝขเผ‹เฝ–เฝเฝ–เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝšเฝด:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(เฝ˜เผ‹เฝเฝผเฝ–เผ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "เฝ˜เฝฒเผ‹เฝ„เฝผ:"
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(เฝ…เฝฒเผ‹เฝ˜เฝบเฝ‘เผ)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เพฑเฝฒเผ‹เฝเฝ–เผ‹เฝ‚เฝŸเฝบเฝข:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "เฝเฝผเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹เฝเฝฒเฝ‚เผ‹เฝเพฒเฝ˜เผ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹%s %sเฝ‚เฝดเฝขเผ‹เฝ•เพฑเฝผเฝ‚เฝฆเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹%s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -242,21 +242,29 @@ msgstr ""
 "cache=/tmp\n"
 " เฝงเฝบเฝ„เผ‹เฝ–เฝ€เฝฃเผ‹เฝ–เฝขเพกเผ‹เฝ‘เฝผเฝ“เผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹ เฝจเฝบเผ‹apt-cache(8)เฝ‘เฝ„เผ‹apt.conf(5)เฝฃเฝ‚เผ‹เฝเฝผเฝ‚เผ‹เฝคเฝผเฝ‚เผ‹เฝฃเฝบเฝ–เผ‹เฝšเฝดเผ‹เฝ–เฝฃเพŸเผ.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "เฝŒเฝฒเฝฆเฝฒเฝ€เผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ–เพณเฝฒเฝ“เผ‹เฝ‚เฝ“เฝ„เผ‹  เฝ‘เฝ”เฝบเฝขเผ‹เฝ“เผ‹ 'Debian 2.1r1 Disk 1'เฝ–เฝŸเฝดเฝ˜เผ"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "เฝŒเฝฒเฝฆเฝฒเฝ€เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ เฝ‘เพฒเฝบเฝ“เผ‹เฝ เฝ•เพฒเฝดเฝฃเผ‹เฝ“เฝ„เผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ–เฝžเฝฒเฝ“เฝ˜เผ‹เฝฃเฝฆเผ‹เฝฃเฝผเฝ‚เผ‹เฝฃเพกเฝบเผ‹เฝ เฝ‘เฝฒเผ‹เฝจเฝบเฝ–เผ"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%sเผ‹เฝฃเฝดเผ‹%sเผ‹เฝ–เฝฆเพเพฑเฝขเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ–เฝเฝ‚เฝฆเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝ†เผ‹เฝšเฝ“เผ‹เฝ“เฝ„เผ‹เฝ‚เฝฒเผ‹เฝฆเฝฒเผ‹เฝŒเฝฒเผ‹เฝฃเพทเฝ‚เผ‹เฝฃเฝดเฝฆเผ‹เฝกเฝผเฝ‘เผ‹เฝ˜เฝฒเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ เผ‹เฝ“เฝฒเผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ‘เฝบเผ‹เฝกเฝ„เผ‹เฝ–เฝฆเพเพฑเฝขเผ‹เฝ เฝ–เฝ‘เผ"
 
@@ -494,7 +502,7 @@ msgstr "%s เผ‹เฝฃเฝผเฝ‚เผ‹เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝ 
 msgid "%s is already the newest version.\n"
 msgstr "%s เผ‹เฝ เฝ‘เฝฒเผ‹เฝงเฝบเผ‹เฝ˜เผ‹เฝฃเฝฆเผ‹เฝขเฝ„เผ‹เฝ เฝเฝผเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹เฝ‚เฝฆเฝขเผ‹เฝคเฝผเฝฆเผ‹เฝ…เฝฒเฝ‚เผ‹เฝจเฝฒเฝ“เผ\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹%sเฝ เฝ‘เฝฒเผ‹เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝจเฝฒเฝ“เผ"
@@ -605,8 +613,8 @@ msgstr "เฝเผ‹เฝฆเพเฝผเฝ„เผ‹เฝ‚เฝฒเผ‹%sBเผ‹เฝ เฝ‘เฝฒเผ‹เฝ–เฝคเฝดเฝ–เผ‹เฝ”เฝ เฝฒ
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sBเผ‹เฝ เฝ‘เฝฒเผ‹เฝคเฝดเฝ–เผ‹เฝ”เฝ เฝฒเผ‹เฝคเฝดเฝฃเผ‹เฝฃเฝฆเผ‹เฝ€เพฑเฝฒเผ‹เฝ–เฝขเผ‹เฝฆเพŸเฝผเฝ„เผ‹เฝ‘เฝบเผ‹เฝ‘เฝฃเฝเผ‹เฝฆเพฆเฝบเผ‹เฝฃเฝดเฝฆเผ‹เฝ เฝผเฝ„เผ‹เผ\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%sเผ‹เฝ“เฝ„เผ‹เฝ–เฝขเผ‹เฝฆเพŸเฝผเฝ„เผ‹"
@@ -645,7 +653,7 @@ msgstr "เฝ–เฝขเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝ เฝ–เฝ‘เผ"
 msgid "Do you want to continue [Y/n]? "
 msgstr "เฝเพฑเฝผเฝ“เผ‹เฝ€เพฑเฝฒเผ‹เฝ เฝ•เพฒเฝผเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ“เฝฒเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝจเฝฒเฝ“เผ‹เฝ“เผ‹[Y/n]?"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %sเผ‹ เฝฃเฝบเฝ“เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ\n"
@@ -654,7 +662,7 @@ msgstr "%s  %sเผ‹ เฝฃเฝบเฝ“เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพ
 msgid "Some files failed to download"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝฃเผ‹เฝฃเฝดเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ•เฝ–เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "เฝ•เฝ–เผ‹เฝฃเฝบเฝ“เผ‹เฝเฝ–เฝฆเผ‹เฝฃเฝ˜เผ‹เฝขเพเพฑเฝ„เฝ˜เผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝ“เฝ„เผ‹เฝ˜เฝ‡เฝดเฝ‚เผ‹เฝ–เฝฆเพกเฝดเฝเผ‹เฝฆเพฆเฝบเผ‹เฝขเฝ„เผ‹เฝ•เฝ–เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ"
 
@@ -732,7 +740,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "เฝ เฝผเฝ‚เผ‹เฝ‚เฝฒเผ‹เฝ–เฝขเพกเผ‹เฝ‘เฝผเฝ“เผ‹เฝ‘เฝบเผ‹เฝ‚เฝฒเฝฆเผ‹เฝ‘เฝดเฝฆเผ‹เฝฆเพเฝ–เฝฆเผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ‚เพฒเฝผเฝ‚เฝฆเผ‹เฝขเฝ˜เผ‹เฝ เฝ–เฝ‘เผ‹เฝ เฝผเฝ„เผ‹:"
 
@@ -781,7 +789,7 @@ msgstr ""
 "เฝ˜เผ‹เฝšเฝ„เผ‹เฝ–เฝ เฝฒเผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹  เฝเฝดเฝฆเผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ˜เฝบเฝ‘เผ‹เฝ˜เฝฒเผ‹เฝšเฝดเผ‹เฝ‘เฝ„เผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝเฝขเผ‹ 'apt-get -f install'เฝ‘เฝบเผ‹เฝ เฝ–เฝเผ‹เฝขเพฉเฝผเฝฃเผ‹เฝ–เฝฆเพเพฑเฝบเฝ‘เฝ”เผ"
 "(เฝกเฝ„เผ‹เฝ“เผ‹เฝเฝ–เฝฆเผ‹เฝคเฝบเฝฆเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝฆเฝฃเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ เฝ–เฝ‘เผ)"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -792,85 +800,85 @@ msgstr ""
 "เฝ เฝ–เฝ‘เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ เฝผเฝ„เผ‹เฝ“เฝฒเผ‹เฝ˜เฝฆเผ‹ เฝกเฝ„เผ‹เฝ“เผ‹เฝ‘เผ‹เฝฃเพŸเฝผเผ‹เฝกเฝ„เผ‹เฝ‚เฝฆเฝขเผ‹เฝ–เฝฆเพเพฒเฝดเฝ“เผ‹เฝ˜เผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝขเผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝฃเผ‹เฝฃเฝดเผ‹เฝ…เฝฒเฝ‚เผ‹เฝกเฝ„เผ‹เฝ“เผ‹เฝ“เฝ„เผ‹"
 "เฝ เฝ–เพฑเฝผเฝขเผ‹เฝ‚เพฑเฝฒเผ‹เฝ•เพฑเฝฒเผ‹เฝเฝขเผ‹เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ–เฝเฝ„เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝขเพฉเผ‹เฝ–เฝขเพŸเฝ“เผ‹เฝ˜เฝบเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝ–เฝ‚เฝผเผ‹เฝ เฝ‚เพฒเฝบเฝ˜เผ‹เฝšเฝดเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝเฝ–เผ‹เฝ‘เฝผเผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝ เฝผเฝ„เผ‹เฝ“เฝฒเผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "เฝ†เฝ‘เผ‹เฝ”เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝšเฝดเผ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "เฝ เฝผเฝ‚เผ‹เฝ‚เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝเฝบเฝ–เฝฆเผ‹เฝšเฝดเผ‹เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ เฝผเฝ„เผ‹:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "เฝ–เฝฆเฝ˜เผ‹เฝ เฝ†เฝขเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝšเฝด:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "เฝ เฝผเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝšเฝด:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%sเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝšเฝผเฝฃเผ‹เฝ˜เผ‹เฝเฝผเฝ–เผ"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹%sเฝ เฝ‘เฝฒเผ‹เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝจเฝฒเฝ“เผ"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "เฝกเฝขเผ‹เฝ–เฝฆเพเพฑเฝบเฝ‘เผ‹เฝขเพฉเฝฒเฝฆเผ‹เฝ–เฝเฝผเฝ“เผ‹เฝ‘เฝผเผ‹... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "เฝ เฝ–เฝ‘เผ‹เฝšเฝขเผ‹เฝกเฝฒเผ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เฝ“เฝ„เผ‹เฝ เฝเฝผเฝ‘เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹ เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เฝฒเผ‹เฝ…เผ‹เฝ†เฝฆเผ‹เฝšเฝดเผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝเฝฃเผ‹เฝกเฝผเฝ‘เผ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "เฝ•เฝ–เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝกเฝฒเฝ‚เผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝขเพเพฑเฝ–เฝฆเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝฃเฝบเฝ“เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ‰เฝดเฝ„เผ‹เฝ˜เฝเฝ เผ‹เฝขเฝ„เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ‘เฝ‚เฝผ"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ เฝšเฝผเฝฃเผ‹เฝ˜เผ‹เฝ เฝเฝผเฝ–"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -878,106 +886,106 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "เฝ‚เฝผเฝ˜เผ‹เฝ เฝ‚เพฑเฝผเผ‹เฝ‚เฝฒเฝฆเผ‹เฝงเฝบเผ‹เฝ˜เผ‹เฝฃเฝฆเผ‹เฝขเฝ„เผ‹'%s'เผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ‘เฝบเผ‹เฝ•เฝ–เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝดเฝ‚\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %sเผ‹เฝ“เฝ„เผ‹เฝเพฑเฝผเฝ‘เผ‹เฝฃเฝดเผ‹เฝ–เฝขเผ‹เฝฆเพŸเฝผเฝ„เผ‹เฝšเฝดเผ‹เฝฃเฝ„เฝ˜เผ‹เฝฆเพฆเฝบเผ‹เฝ˜เฝฒเฝ“เผ‹เฝ เฝ‘เฝดเฝ‚เผ‹"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sBเผ‹เฝฃเฝบเฝ“เผ‹เฝ‘เฝ‚เฝผเฝ”เผ‹เฝ เฝ‘เฝดเฝ‚เผ‹  เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹%sBเผ\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝšเฝดเผ‹เฝ€เพฑเฝฒเผ‹%sBเผ‹เฝฃเฝบเฝ“เผ‹เฝ‘เฝ‚เฝผเผ‹เฝ”เฝฆเฝฆเผ\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%sเผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝฃเฝบเฝ“เผ\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝฃเผ‹เฝฃเฝดเผ‹เฝ…เฝฒเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%sเผ‹เฝ“เฝ„เผ‹เฝงเฝบเผ‹เฝ˜เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝจเฝฒเฝ“เผ‹เฝ˜เฝ เฝฒเผ‹เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝ‚เฝผเฝ˜เผ‹เฝ เฝ‚เพฑเฝผเผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‘เฝบเผ‹เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เผ‹เฝ…เฝฒเฝ“เผ‹เฝจเฝบเฝ–เผ‹เฝ‚เฝเฝ„เผ‹เฝ เฝ–เฝ‘เผ\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝขเพฉเฝฒเฝ‚เฝฆเผ‹เฝ–เฝขเพกเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "เฝ†เผ‹เฝฃเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ‘เฝบเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ“เฝดเฝ‚"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps เฝžเฝฒเฝ–เผ‹เฝ‘เฝ”เพฑเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ‰เฝดเฝ„เผ‹เฝ˜เฝเฝ เผ‹เฝขเฝ„เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝฆเฝฃเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝ‚เฝผ"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝขเพฉเฝฒเฝ‚เฝฆเผ‹-เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ–เฝขเพกเผ‹เฝ‘เฝผเฝ“เผ‹เฝ‘เฝบเผ‹เฝฃเฝบเฝ“เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s เฝฃเฝดเผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝขเพฉเฝฒเฝ‚เฝฆเผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ˜เฝฒเฝ“เผ‹เฝ เฝ‘เฝดเฝ‚\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%sเฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเฝ”เผ‹เฝฃเฝฆเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ‹ %sเฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹%s เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ‘เฝบเผ‹เฝ„เฝฃเผ‹เฝขเฝ„เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%sเฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเฝ”เผ‹เฝฃเฝฆเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ‹ %sเฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹%s เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ‘เฝบเผ‹เฝ„เฝฃเผ‹เฝขเฝ„เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹%sเผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ‘เฝบเผ‹เฝ‚เฝฒเผ‹เฝขเฝบเผ‹เฝ–เผ‹เฝฆเพเฝผเฝ„เผ‹เฝ“เฝฒเผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ‹  เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹"
 "เฝฆเพ’เพฒเฝฒเฝฃเผ‹%sเผ‹เฝ‘เฝบเผ‹เฝ‚เฝ“เฝ˜เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝ‚เฝฆเฝขเฝ”เผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -986,37 +994,37 @@ msgstr ""
 "%s เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹%sเผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเผ‹เฝขเฝบเผ‹เฝ–เผ‹เฝฆเพเฝผเฝ„เผ‹เฝ˜เฝฒเผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ“เฝดเฝ‚เผ‹เฝ‚เผ‹เฝ…เฝฒเผ‹เฝ เฝ–เฝ‘เผ‹เฝŸเฝบเฝขเผ‹เฝ–เผ‹เฝ…เฝฒเฝ“เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เฝขเฝฒเฝฃเผ‹%sเผ‹เฝ‚เฝฒเผ‹เฝ เฝเฝผเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹"
 "เฝšเฝดเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเฝ”เผ‹เฝฃเฝฆเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ‹เฝ เฝเฝผเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹เฝ‘เฝ‚เฝผเฝฆเผ‹เฝ˜เฝเฝผเผ‹เฝšเฝดเผ‹เฝ‚เฝฒเผ‹เฝขเฝบเผ‹เฝ–เผ‹เฝ‘เฝผเผ‹เฝฆเพเฝผเฝ„เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%sเฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเฝ”เผ‹เฝฃเฝฆเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ‹ %sเฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹%s เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ‘เฝบเผ‹เฝ„เฝฃเผ‹เฝขเฝ„เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เผ‹%sเผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ„เฝฃเผ‹เฝขเฝ„เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ“เฝดเฝ‚"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝขเพฉเฝฒเฝ‚เฝฆเผ‹-เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ„เฝฃเผ‹เฝขเฝ„เฝฆเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "เฝ–เฝŸเฝผเผ‹เฝ–เฝขเพฉเฝฒเฝ‚เฝฆเผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s)เผ‹เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "เฝขเพ’เพฑเฝ–เผ‹เฝฆเพเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝšเฝ‘เผ‹เฝ‚เฝžเฝฒเผ‹เฝšเฝด:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1105,7 +1113,7 @@ msgstr ""
 "เฝคเฝผเฝ‚เผ‹เฝฃเฝบเฝ–เผ‹เฝšเฝดเผ‹เฝฃเฝดเผ‹เฝ–เฝฃเพŸเผ\n"
 "                       เฝ เผ‹เฝ“เฝฒเผ‹ เฝจเฝบเผ‹เฝŠเฝฒเผ‹เฝ”เฝฒเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝดเผ‹เฝกเฝ„เผ‹เฝ‘เฝ‚เผ‹ เฝ€เฝ เฝดเผ‹ เฝ“เฝดเฝฆเผ‹เฝคเฝดเฝ‚เฝฆเผ‹เฝšเฝดเผ‹เฝกเฝผเฝ‘เผ\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1176,7 +1184,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s เผ‹เฝ เฝ‘เฝฒเผ‹เฝงเฝบเผ‹เฝ˜เผ‹เฝฃเฝฆเผ‹เฝขเฝ„เผ‹เฝ เฝเฝผเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹เฝ‚เฝฆเฝขเผ‹เฝคเฝผเฝฆเผ‹เฝ…เฝฒเฝ‚เผ‹เฝจเฝฒเฝ“เผ\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ–เฝฆเพ’เฝดเฝ‚เผ‹เฝฆเพกเฝผเฝ‘เผ‹เฝ…เฝฒเผ‹ เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ•เฝขเผ‹เฝ˜เฝฒเฝ“เผ‹เฝ เฝ‘เฝดเฝ‚"
@@ -1315,8 +1324,8 @@ msgstr "เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ„เฝฃเผ‹เฝ˜เฝšเฝ˜เฝฆ"
 msgid "Server closed the connection"
 msgstr "เฝฆเฝขเผ‹เฝ–เฝขเผ‹เฝ‚เพฑเฝฒเฝฆเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ–เฝฆเพกเฝ˜เฝฆเผ‹เฝเฝบเผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹เฝฃเพทเฝ–เผ"
 
@@ -1329,8 +1338,8 @@ msgid "Protocol corruption"
 msgstr "เฝ‚เฝ“เฝ‘เผ‹เฝฆเพคเฝบเฝฃเผ‹เฝฃเฝ˜เผ‹เฝฃเฝดเฝ‚เฝฆเผ‹ เฝ„เฝ“เผ‹เฝ…เฝ“เผ"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹เฝ เฝ–เพฒเฝฒเผ"
 
@@ -1384,7 +1393,7 @@ msgstr "เฝ‚เฝ“เฝ‘เผ‹เฝฆเพกเฝดเฝ‘เผ‹เฝฆเฝผเผ‹เฝ€เฝบเฝŠเฝฒเผ‹ เฝ˜เฝเฝดเฝ‘เผ‹เฝ“เฝ
 msgid "Unable to accept connection"
 msgstr "เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ เฝ‘เฝฒเผ‹เฝ‘เฝ„เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝฃเฝดเผ‹เผ‹เฝ‘เพฒเพญเผ‹เฝขเพŸเฝ‚เฝฆเผ‹เฝ–เฝ€เฝฃเผ‹เฝ–เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
@@ -1411,89 +1420,102 @@ msgstr "เฝ เฝ‘เพฒเฝฒเผ‹เฝ‘เฝ”เพฑเฝ‘เผ"
 msgid "Unable to invoke "
 msgstr "เฝฃเฝฆเผ‹เฝ–เฝ€เฝผเฝฃเผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s)เผ‹เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u)เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝฆเฝผเผ‹เฝ€เฝบเฝŠเฝฒเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝฆเฝขเผ‹เฝ–เฝฆเพเพฒเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s)เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ‘เฝบเผ‹เฝ เฝ‚เฝผเผ‹เฝ เฝ–เพฑเฝบเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr " %s:%s (%s)เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹  เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ„เฝฃเผ‹เฝ˜เฝšเฝ˜เฝฆเผ"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr " %s:%s (%s)เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "%sเผ‹เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ‚เฝ“เฝฆเผ‹เฝฆเพเฝ–เฝฆเผ‹เฝ€เพฑเฝฒเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "'%s:%s' (%i)เผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ„เฝ“เผ‹เฝ”เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝฒเผ"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i)เผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ„เฝ“เผ‹เฝ”เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝฒเผ"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s:เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "เฝ“เฝ„เผ‹เฝ เฝเฝผเฝ‘เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–: เฝ˜เฝฒเฝ„เผ‹เฝขเพŸเฝ‚เฝฆเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝบเฝ‚เฝฆเผ‹เฝคเฝผเฝ˜เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ เฝ‘เฝดเฝ‚เผ‹  เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ˜เฝ›เฝดเฝ–เผ‹เฝขเพ—เฝบเฝฆเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝ‘เฝบเผ‹เฝ‚เฝเฝ“เผ‹เฝ เฝ–เฝบเฝ–เฝฆเผ‹เฝ–เฝŸเฝผเผ‹"
 "เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "เฝ‰เฝดเฝ„เผ‹เฝ˜เฝเฝ เผ‹เฝขเฝ„เผ‹เฝ“เฝดเฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝ˜เฝฒเฝ„เผ‹เฝขเพŸเฝ‚เฝฆเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝ‘เฝผเฝ„เผ‹เฝเฝดเฝ‚เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝฆเพŸเฝบเผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "เฝ˜เฝฒเฝ„เผ‹เฝขเพŸเฝ‚เฝฆเผ‹เฝ–เฝ‘เฝบเฝ“เผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹'%s'เฝ เฝ‘เฝฒเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝเฝ–เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ (gpgvเผ‹เฝ‘เฝบเผ‹เฝเฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ‹เฝ“เผ?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "gpgvเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝเฝ–เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ˜เผ‹เฝคเฝบเฝฆเผ‹เฝ”เฝ เฝฒเผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹เผ"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "เฝ เฝผเฝ‚เผ‹เฝ‚เฝฒเผ‹เฝ˜เฝฒเฝ„เผ‹เฝขเพŸเฝ‚เฝฆเผ‹เฝšเฝดเผ‹เฝ“เฝดเฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1532,53 +1554,53 @@ msgstr "เฝ เผ‹เฝ“เฝฒเผ‹ เฝจเฝบเฝ†เฝฒเผ‹เฝŠเฝฒเผ‹เฝŠเฝฒเผ‹เฝ”เฝฒเผ‹ เฝฆเฝขเผ‹เฝ–เ
 msgid "Unknown date format"
 msgstr "เฝ˜เผ‹เฝคเฝบเฝฆเผ‹เฝ”เฝ เฝฒเผ‹เฝšเฝบเฝฆเผ‹เฝขเพฉเผ‹เฝฆเพ’เพฒเฝฒเฝ‚"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "เฝฆเฝบเฝฃเผ‹เฝ เฝเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ„เฝฃเผ‹เฝ˜เฝšเฝ˜เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "เฝจเฝ เฝดเฝŠเฝฒเผ‹เฝ”เฝดเฝŠเฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝฃเฝดเผ‹เฝ เฝ–เพฒเฝฒเฝเผ‹เฝ‘เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝฃเฝดเผ‹เฝ เฝ–เพฒเฝฒเฝเผ‹เฝ‘เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝ–เพฒเฝฒเฝเผ‹เฝ‘เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เฝฆเฝขเผ‹เฝ–เฝขเผ‹เฝ“เฝ„เผ‹เฝฃเฝฆเผ‹เฝฃเพทเฝ‚เผ‹เฝ”เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ เฝเฝ‚เผ‹เฝขเฝฒเฝ„เผ‹เฝ˜เฝ‡เฝดเฝ‚เผ‹เฝ‚เฝฒเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ‘เฝบเผ‹เฝเผ‹เฝ–เฝฆเพกเฝ˜เฝฆเผ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "เฝฆเฝขเผ‹เฝ–เฝขเผ‹เฝ“เฝ„เผ‹เฝฃเฝฆเผ‹เฝฃเพทเฝ‚เผ‹เฝ”เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "เฝ˜เฝ‚เฝผเผ‹เฝกเฝฒเฝ‚เผ‹เฝ‚เฝ“เฝ‘เผ‹เฝฆเพกเฝดเฝ‘เผ‹เฝ–เพฑเฝ„เผ‹เฝ‰เฝบเฝฆเผ"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "เฝ–เฝเฝดเฝ‘เผ‹เฝฃเฝ˜เผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "เฝ“เฝ„เผ‹เฝ เฝเฝผเฝ‘เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝดเผ‹เฝฃเพทเฝ‚เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
@@ -1605,7 +1627,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1701,7 +1728,7 @@ msgstr ""
 "  -o=? เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝขเฝฒเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ‚เฝ‘เฝ˜เผ‹เฝเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝžเฝฒเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝจเฝฒเฝ“เผ‹  เฝ‘เฝ”เฝบเฝขเผ‹เฝ“เผ‹-o dir::cache=/tmpเผ‹"
 "เฝ–เฝŸเฝดเฝ˜เผ\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr " %sเฝฃเฝดเผ‹เฝ เฝ–เพฒเฝฒเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
@@ -1851,8 +1878,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "%s: %sเผ‹เฝŒเฝฒเผ‹เฝ–เฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%sเผ‹เฝฆเฝฒเฝŠเฝบเฝŠเฝฒเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
@@ -1865,87 +1892,87 @@ msgstr "เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝดเผ‹เฝšเฝ‘เผ‹เฝ เฝ›เฝฒเฝ“เผ‹
 msgid "Unable to get a cursor"
 msgstr "เฝ เฝผเฝ‘เผ‹เฝขเพŸเฝ‚เฝฆเผ‹เฝฃเฝบเฝ“เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "เฝŒเฝ–เผ‹เฝฃเฝด:%sเฝฆเพฃเฝผเฝ‘เผ‹เฝเฝผเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเพทเฝ‚เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "เฝŒเฝ–เผ‹เฝฃเฝดเผ‹ %s เฝฆเฝฒเฝŠเฝบเฝŠเฝฒเผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "เฝจเฝฒ:"
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "เฝŒเฝ–เผ‹เฝฃเฝด:"
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "เฝจเฝฒ:เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹เฝšเฝดเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝฃเฝดเผ‹เฝ เฝ‡เฝดเฝ‚เผ‹เฝฆเพคเพฑเฝผเฝ‘เผ‹เฝ เฝ–เฝ‘เผ"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%sเผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "เฝขเพฉเผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ•เพฑเฝฒเฝขเผ‹เฝ–เฝ‚เพฒเฝผเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%sเผ‹เฝ‚เผ‹เฝ•เพฑเฝบเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%sเผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝฃเฝ˜เผ‹เฝฃเพทเฝ‚เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%sเผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝฃเฝ˜เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %sเผ‹เฝฃเฝฆเผ‹%sเฝฃเฝดเผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝเฝดเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "%sBเผ‹เฝงเฝบเฝ„เผ‹เฝ–เฝ€เฝฃเผ‹เฝ–เฝ€เพฒเฝ˜เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ˜เฝบเฝ‘เผ‹เฝ–เฝ…เฝ‘เผ‹เฝ˜เฝšเฝ˜เฝฆเผ\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝฃเฝดเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ…เฝฒเผ‹เฝกเฝ„เผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ˜เผ‹เฝ–เพฑเฝดเฝ„เผ‹เผ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %sเฝฃเฝดเผ‹เฝŸเฝดเฝขเผ‹เฝ–เฝžเฝ‚เผ‹เฝเฝผเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ˜เฝบเฝ‘เผ\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s เผ‹เฝขเพ’เพฑเฝดเฝ“เผ‹เฝฆเพเพฑเฝผเฝ„เผ‹เฝ”เผ‹เฝ เฝ‘เฝฒเผ‹  %s เฝจเฝฒเฝ“เผ‹   %s เฝ˜เฝบเฝ“เผ\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s เฝฃเฝดเผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝ‚เฝเฝ„เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝเฝผเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เฝบเฝ‘เผ\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %sเฝฃเฝดเผ‹เฝŸเฝดเฝ„เผ‹เฝฃเพกเฝ“เผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝ‚เฝเฝ„เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เผ‹เฝเฝผเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ‚เฝ„เผ‹เฝขเฝดเฝ„เผ‹เฝกเฝ„เผ‹เฝ˜เฝฒเฝ“เผ‹เฝ เฝ‘เฝดเฝ‚เผ\n"
@@ -2019,7 +2046,7 @@ msgstr "เฝจเฝบเฝ˜เผ‹เฝŒเฝฒเผ‹เผฅเผ‹เฝ‚เพณเฝผเฝ‚เผ‹เฝขเฝฒเฝ‚เผ‹เฝขเพเพฑเฝ–เผ‹เฝ”
 msgid "Problem unlinking %s"
 msgstr "%sเผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝเฝดเฝ‘เผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝ–เฝŸเฝผเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%sเผ‹เฝฃเฝดเผ‹%sเผ‹เฝ–เฝฆเพเพฑเฝขเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ–เฝเฝ‚เฝฆเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
@@ -2079,23 +2106,23 @@ msgstr ""
 "  -o=? เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเฝฆเผ‹ เฝ˜เฝเฝดเฝ“เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹ เฝขเฝฒเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ‚เฝฒเผ‹เฝ‚เฝ‘เฝ˜เผ‹เฝเผ‹เฝšเฝดเผ‹เฝเฝžเฝฒเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝจเฝฒเฝ“เผ‹   เฝ‘เฝ”เฝบเฝขเผ‹เฝ“เผ‹-o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "เฝขเพ’เพฑเฝดเฝ‘เผ‹เฝ‘เฝดเฝ„เผ‹เฝšเฝดเผ‹เฝ‚เฝฆเฝขเผ‹เฝ–เฝฆเพเพฒเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "เฝ‡เฝฒเผ‹เฝ›เฝฒเฝ”เผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝเฝ–เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "เฝ„เฝ“เผ‹เฝ…เฝ“เผ‹เฝ‚เพฑเฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "เฝŠเฝขเผ‹เฝ…เฝบเฝ‚เผ‹เฝฆเฝ˜เผ‹เฝ‘เฝบเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ‹  เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝ„เฝ“เผ‹เฝ…เฝ“เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ“เฝดเฝ‚"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "เฝ˜เผ‹เฝคเฝบเฝฆเผ‹เฝ”เฝ เฝฒเผ‹ เฝŠเฝฑเฝขเผ‹เผ‹เฝ˜เฝ‚เฝผเผ‹เฝกเฝฒเฝ‚เผ‹เผ‹เฝ‘เฝ–เพฑเฝบเผ‹เฝ–เผ‹ %uเผ‹ เฝ เฝเฝดเฝฆเผ‹เฝ˜เฝฒเผ‹ %sเผ"
@@ -2166,54 +2193,54 @@ msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เพฒเฝฒเผ‹เฝ“เฝฒเผ‹เฝฃเ
 msgid "Failed to close file %s"
 msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ–เฝฆเพกเฝ˜เฝฆเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "%sเผ‹เฝ เฝ‚เพฒเฝดเฝฃเผ‹เฝฃเฝ˜เผ‹เฝ‘เฝบเผ‹เฝ‚เฝ“เฝ˜เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝขเฝฒเฝ„เฝ˜เผ‹เฝ เฝ‘เฝดเฝ‚"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝคเฝผเฝฃเผ‹%sเผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฃเพทเฝ‚เผ‹เฝฆเพŸเฝบเผ‹เฝ เฝ‘เฝดเฝ‚"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "เฝฆเพฃเฝผเฝ‘เผ‹เฝเฝผเผ‹%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝผเฝ‚เฝฆเผ‹เฝฆเพ’เพฑเฝดเฝขเผ‹เฝ‘เฝบเผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเฝฆเผ‹เฝ‚เผ‹เฝฆเพ’เพฑเฝดเฝขเผ‹เฝ‘เฝ˜เฝฒเฝ‚เฝฆเผ‹เฝ‚เฝเฝ‘เผ‹%s/%sเผ‹เฝฃเฝดเผ‹เฝ เฝ–เพฒเฝฒเผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝ เฝ–เฝ‘เผ‹เฝขเพฉเฝผเฝฃเผ‹เฝ–เฝฆเพเพฑเฝบเฝ‘เฝ”เผ‹เฝ‘เฝบเผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "เฝเผ‹เฝฆเพ’เพฑเฝดเฝขเผ‹เฝ เฝ‚เพฒเฝดเฝฃเผ‹เฝฃเฝ˜เผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝ“เฝ˜เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝขเฝฒเฝ„เฝ˜เผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "เฝฆเพฃเฝผเฝ‘เผ‹เฝกเฝฒเฝ‚เผ‹%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝกเฝฒเฝ‚เผ‹เฝ˜เฝบเฝ“เผ‹เฝ˜เฝฒเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝฒเฝฆเผ‹เฝšเฝ–เผ‹เฝ–เฝ™เฝดเฝ‚เผ‹เฝ‘เฝบเผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "เฝเฝผเฝ„เผ‹เฝขเฝ เฝฒเผ‹เฝ‘เพฒเพญเผ‹เฝขเพŸเฝ‚เฝฆเผ (#)เฝขเพกเฝผเฝ–เผ‹เฝ“เฝ„เผ‹เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ‘เผ‹เฝ˜เฝšเฝ˜เฝฆเผ‹เฝ‚เผ‹เฝกเฝผเฝ‘เผ‹เฝ เฝšเฝผเฝฃเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "เฝ เฝ‚เพฒเฝดเฝฃเผ‹เฝฃเฝ˜เผ‹เฝ‘เฝบเผ‹เฝ‚เฝ“เฝ˜เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝขเฝฒเฝ„เฝ˜เผ‹เฝ…เฝฒเฝ‚เผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝšเฝ–เผ‹เฝฆเพฒเฝดเฝ„เผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝ เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‘เฝบเผ‹เฝ‚เฝฒเฝฆเผ‹เฝ เฝเฝผเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝ‘เผ‹เฝกเฝ„เผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ˜เฝฒเผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝฆเผ"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹%sเผ‹เฝ“เฝ„เผ‹เฝฃเฝดเผ‹เผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹%s/%sเฝ‚เฝฒเฝฆเผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝšเฝ–เผ‹เฝฆเพฒเฝดเฝ„เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝดเผ‹เฝ„เฝผเผ‹เฝ–เฝคเฝดเฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
@@ -2292,30 +2319,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "เฝฆเฝบเฝฃเผ‹เฝ เฝเฝดเผ‹%s เผ‹เฝ˜เผ‹เฝ เฝเฝผเฝ–เผ"
@@ -2385,6 +2412,16 @@ msgstr "%c%s... เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹!"
 msgid "%c%s... Done"
 msgstr "%c%s... เฝ เฝ–เฝ‘เผ‹เฝšเฝขเผ‹เฝกเฝผเฝ‘เผ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... เฝ เฝ–เฝ‘เผ‹เฝšเฝขเผ‹เฝกเฝผเฝ‘เผ"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2445,115 +2482,121 @@ msgstr "เฝฆเฝฒเผ‹เฝŒเฝฒเผ‹เฝขเฝผเฝ˜เผ‹เฝ เฝ‘เฝฒเผ‹เฝ„เฝผเผ‹เฝ–เฝคเฝดเฝฆเผ‹เฝ เฝ–
 msgid "Problem closing the gzip file %s"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ–เฝฆเพกเฝ˜เฝฆเผ‹เฝ”เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "%s เฝฃเพทเฝ‚เผ‹เฝ“เฝฒเผ‹เฝขเพเพฑเฝ„เฝ˜เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เฝฒเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝขเพเพฑเฝ–เผ‹เฝ“เฝฒเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ˜เฝฒเผ‹เฝ เฝเฝ–เผ‹เฝ”เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝขเพเพฑเฝ–เฝฆเผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "เฝจเฝบเฝ“เผ‹เฝจเฝบเฝ•เผ‹เฝจเฝบเฝฆเฝฒเผ‹ %s เฝฆเพฆเพฑเฝขเผ‹เฝ–เฝขเพฉเฝบเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝขเพเพฑเฝ–เผ‹เฝ“เฝฒเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ˜เฝฒเผ‹เฝ เฝเฝ–เผ‹เฝ”เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%sเฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝขเพเพฑเฝ–เผ‹เฝ“เฝฒเผ‹เฝฃเฝบเฝ“เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "เฝกเฝ“เผ‹เฝฃเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹%sเผ‹เฝฃเฝดเผ‹เฝ†เผ‹เฝ–เฝ‚เฝผเฝฆเผ‹เฝ€เพฑเฝฒเผ‹เฝฆเพเพฑเฝผเฝ“เผ‹เฝ…เฝฒเฝ‚เผ‹เฝเฝผเฝ–เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "เฝกเฝ“เผ‹เฝฃเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹%sเผ‹เฝฃเฝดเผ‹เฝ†เผ‹เฝ–เฝ‚เฝผเฝฆเผ‹เฝ€เพฑเฝฒเผ‹เฝฆเพเพฑเฝผเฝ“เผ‹เฝ…เฝฒเฝ‚เผ‹เฝเฝผเฝ–เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "เฝกเฝ“เผ‹เฝฃเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹%sเผ‹เฝ‚เฝฒเฝฆเผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เฝ เฝฒเผ‹เฝจเฝ„เผ‹เฝขเพŸเฝ‚เฝฆเผ‹(%u)เฝ…เฝฒเฝ‚เผ‹เฝฆเพณเฝขเผ‹เฝฃเฝผเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "เฝกเฝ“เผ‹เฝฃเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เผ‹%sเผ‹เฝ‚เฝฒเฝฆเผ‹เฝขเฝบเผ‹เฝ–เผ‹เฝ˜เฝบเฝ‘เผ‹เฝ”เฝขเผ‹เฝ•เพฑเฝฒเฝขเผ‹เฝเฝผเฝ“เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%sเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝขเพ’เพฑเฝดเฝ‘เผ‹เฝ‘เฝดเฝ„เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "เฝกเฝ“เผ‹เฝฃเฝ‚เผ‹เฝฃเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹ เฝจเฝ เฝฒเผ‹เฝ”เฝฒเผ‹เฝฆเฝฒเผ‹ เฝ‚เฝฆเฝขเผ‹เฝ–เฝฆเพเพฒเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "เฝจเฝบเฝ–เผ‹เฝ เฝ•เพฒเฝดเฝฃเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝเฝ–เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "เฝฃเพทเฝ‚เผ‹  เฝ‘เผ‹เฝฃเพŸเฝผเผ‹เฝกเฝ„เผ‹เฝฃเพทเฝ‚เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹%luเผ‹เฝกเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ…เฝฒเผ‹เฝกเฝ„เผ‹เฝฃเพทเฝ‚เผ‹เฝฃเฝดเฝฆเผ‹เฝ˜เฝฒเฝ“เผ‹เฝ เฝ‘เฝดเฝ‚"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "เฝ เฝ–เพฒเฝฒเผ‹  เฝ‘เผ‹เฝฃเพŸเฝผเผ‹เฝกเฝ„เผ‹เฝ เฝ–เพฒเฝฒเผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹%luเผ‹เฝกเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝ‘เฝ–เฝเผ‹เฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ–เฝฆเพกเฝ˜เฝฆเผ‹เฝ”เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ˜เฝ‰เฝ˜เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เพฒเฝบเฝฃเฝฃเฝ˜เผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ˜เฝ‰เฝ˜เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ–เฝขเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เพฒเผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝฆเพŸเฝผเฝ„เฝ˜เผ"
@@ -2580,59 +2623,59 @@ msgstr "เฝ เผ‹เฝ“เฝฒเผ‹เฝจเฝบเผ‹เฝ”เฝฒเผ‹เฝŠเฝฒเผ‹ เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเฝฆเผ‹ '%s'
 msgid "The package cache was built for a different architecture"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เพฒเผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝฆเฝผเผ‹เฝฆเฝผเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝขเพฉเฝฒเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝจเฝฒเฝ“เฝ”เฝฆเผ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "เฝขเพŸเฝบเฝ“เฝ˜เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "เฝฆเพ”เฝผเฝ“เผ‹เฝ‚เฝผเฝ„เผ‹เฝ˜เผ‹เฝขเพŸเฝบเฝ“เฝ˜เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "เฝ–เฝฆเฝ˜เผ‹เฝ เฝ†เฝขเผ‹เฝ–เฝ€เฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "เฝ เฝผเฝฆเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "เฝ˜เฝฒเผ‹เฝ˜เฝเฝดเฝ“เฝ˜เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "เฝšเฝ–เผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเฝ”เผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "เฝ•เฝ“เผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝ–เฝŸเฝผเฝเผ‹เฝจเฝฒเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "เฝ‚เฝฃเผ‹เฝ…เฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "เฝ‘เฝ‚เฝผเฝฆเผ‹เฝ˜เฝเฝผเผ‹เฝกเฝผเฝ‘เฝ”เผ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "เฝšเฝ‘เผ‹เฝฃเพกเฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "เฝ‚เฝ‘เฝ˜เผ‹เฝเผ‹เฝ…เฝ“เผ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "เฝเฝบเฝ–เฝฆเผ"
 
@@ -2733,29 +2776,29 @@ msgstr "%sเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ‘เฝผเผ"
 msgid "Line %u too long in source list %s."
 msgstr "เฝ‚เพฒเฝฃเผ‹เฝเฝฒเฝ‚เผ‹%uเผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹%sเผ‹เฝ“เฝ„เผ‹เฝฃเฝดเผ‹เฝ‚เฝ“เฝ˜เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝขเฝฒเฝ„เฝ˜เฝผเผ‹เฝ เฝ‘เฝดเฝ‚"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "เฝ–เฝŸเฝผเผ‹เฝ‰เฝบเฝฆเผ‹เฝ เฝ‚เพฑเฝดเฝขเผ‹เฝ–เฝ เฝฒเผ‹เฝ‚เพฒเฝฃเผ‹เฝเฝฒเฝ‚เผ‹%uเผ‹ เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹%s (เฝ‘เฝ–เพฑเฝบเผ‹เฝ–)เผ‹เฝ“เฝ„เผ‹เฝ“เผ"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "เฝ‘เฝ–เพฑเฝบเผ‹เฝ–เผ‹'%s'เผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เพฒเฝฃเผ‹เฝเฝฒเฝ‚เผ‹%uเผ‹เฝ‚เฝดเฝขเผ‹เฝฃเฝดเผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹%sเผ‹เฝ‚เฝฒเผ‹เฝ“เฝ„เผ‹เฝ“เผ‹เฝ˜เผ‹เฝคเฝบเฝฆเผ‹เฝ”เฝฆเผ"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2780,7 +2823,7 @@ msgstr ""
 "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝฃเฝผเฝ‚เผ‹เฝ เฝ‘เฝฒเผ‹เฝขเฝ„เผ‹เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝ‚เฝผเฝ”เผ‹เฝ เฝ‘เฝดเฝ‚เผ‹ เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝกเฝฒเฝ‚เผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ เฝšเฝผเฝฃเผ‹"
 "เฝ˜เผ‹เฝเฝผเฝ–เผ"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2788,11 +2831,11 @@ msgstr ""
 "เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹ pkgProblemResolver::เฝ‚เฝฒเฝฆเผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝเฝผเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝ˜เฝšเฝ˜เฝฆเผ‹เฝ‘เฝบเผ‹เฝšเฝดเผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ–เฝŸเฝผเฝเผ‹เฝจเฝฒเฝ“ เฝ เผ‹เฝ“เฝฒเผ‹เฝเฝดเฝ˜เผ‹"
 "เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝšเฝดเผ‹เฝ เฝ›เฝฒเฝ“เผ‹เฝ”เฝ เฝฒเผ‹เฝขเพ’เพฑเฝดเผ‹เฝขเพเพฑเฝบเฝ“เผ‹เฝฃเฝฆเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ‹เฝจเฝฒเฝ“เผ‹เฝ”เฝฆเผ"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ“เฝผเฝขเผ‹เฝ–เฝ…เฝผเฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ‹ เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ†เฝ‘เผ‹เฝ”เผ‹เฝšเฝดเผ‹เฝ เฝ†เฝ„เผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝ‘เฝดเฝ‚"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2801,7 +2844,7 @@ msgstr ""
 "เฝŸเฝดเฝขเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝฃเผ‹เฝฃเฝดเผ‹เฝ…เฝฒเฝ‚เผ‹เฝ•เฝ–เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฃเฝดเผ‹เฝ เฝเฝดเฝฆเผ‹เฝคเฝผเฝขเผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ“เฝดเฝ‚เผ‹  เฝ เฝ‘เฝฒเผ‹เฝšเฝดเผ‹เฝฆเพฃเฝ„เผ‹เฝ˜เฝบเฝ‘เผ‹เฝฆเพฆเฝบเผ‹เฝ–เฝžเฝ‚เฝ”เผ‹เฝ˜เผ‹เฝšเฝ‘เผ‹ เฝšเฝ–เผ‹เฝฃเฝดเผ‹"
 "เฝขเพ™เฝฒเฝ„เฝ˜เผ‹เฝ เฝ‘เฝฒเผ‹เฝšเฝดเผ‹เฝฃเฝ‚เผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝเฝ–เผ‹เฝ“เฝดเฝ‚"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "เฝเฝผเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เฝฒเผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝเฝผเผ‹%sเผ‹เฝ†เผ‹เฝคเฝฆเผ‹เฝ เฝ‘เฝฒเผ‹เฝ–เฝขเพณเฝ‚เผ‹เฝฆเพŸเฝผเฝขเผ‹เฝŸเฝดเฝ‚เฝฆเผ‹เฝเฝบเผ‹เฝ เฝ‘เฝดเฝ‚"
@@ -2838,17 +2881,17 @@ msgstr "เฝเฝ–เฝฆเผ‹เฝฃเฝ˜เผ‹เฝ เฝ‘เพฒเฝบเฝ“เผ‹เฝ–เพฑเฝบเฝ‘เผ‹%sเผ‹เฝ เฝ‘เฝฒเผ‹เ
 msgid "Method %s did not start correctly"
 msgstr "เฝเฝ–เฝฆเผ‹เฝฃเฝ˜เผ‹ %s เฝ เฝ‘เฝฒเผ‹เฝ„เฝบเฝฆเผ‹เฝ–เฝ‘เฝบเฝ“เผ‹เฝฆเพฆเฝบเผ‹เฝ เฝ‚เฝผเผ‹เฝ˜เผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "เฝเผ‹เฝกเฝฒเฝ‚เผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹ เฝŒเฝฒเฝฆเฝฒเผ‹เฝ เฝ‘เฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ‚เฝ“เฝ„เผ‹เผ '%s'เฝ เฝ‘เพฒเฝบเฝ“เผ‹เฝ เฝ•เพฒเฝดเฝฃเผ‹เฝ“เฝ„เผ‹'%s' เฝ‘เฝ„เผ‹เฝฃเฝผเฝ‚เผ‹เฝฃเพกเฝบเผ‹เฝ เฝ‘เฝฒเผ‹เฝจเฝบเฝ–เผเผ‹"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝขเฝฒเฝ˜เผ‹เฝฃเฝดเฝ‚เฝฆเผ‹ '%s' เฝ เฝ‘เฝฒเผ‹เฝฃเฝดเผ‹เฝขเพ’เพฑเฝ–เผ‹เฝฆเพเพฑเฝผเฝขเผ‹เฝ˜เผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝฆเผ"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "เฝ เฝผเฝฆเผ‹เฝ เฝ–เฝ–เผ‹เฝ‘เฝ„เผ‹เฝฃเพกเฝ“เผ‹เฝ”เฝ เฝฒเผ‹เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝขเฝฒเฝ˜เผ‹เฝฃเฝดเฝ‚เฝฆเผ‹เฝ€เพฑเฝฒเผ‹เฝ‘เฝ–เพฑเฝบเผ‹เฝ–เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เฝเฝ“เผ‹เฝ เฝ–เฝบเฝ–เฝฆเผ‹เฝ–เฝŸเฝผเผ‹เฝ˜เฝฒเผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆเผ"
 
@@ -2902,14 +2945,14 @@ msgstr "เฝ เฝ‘เพฒเผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝฃเฝดเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ‚เพฑเฝดเฝขเผ‹เฝ˜
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s (เฝ”เฝฒเผ‹เฝ€เฝบเผ‹เฝ‡เฝฒเผ‹เฝ เฝšเฝผเฝฃเผ‹เฝ“เฝฒ)เฝ‘เฝบเผ‹เฝ–เฝŸเฝผเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝ“เฝดเฝ‚"
@@ -2931,26 +2974,26 @@ msgstr "เฝ”เฝ เฝผเผ‹เผ‹เผ‹เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเฝฆเผ‹ เฝจเฝบเผ‹เฝ”เฝฒเผ‹เฝŠเฝ
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "เฝ”เฝ เฝผเผ‹เผ‹เผ‹เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเฝฆเผ‹ เฝจเฝบเผ‹เฝ”เฝฒเผ‹เฝŠเฝฒเผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเฝฆเผ‹เฝ–เฝŸเฝผเฝ‘เผ‹เฝเฝดเฝ–เผ‹เฝ”เฝ เฝฒเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ‹เฝ”เฝ เฝฒเผ‹เฝจเฝ„เผ‹เฝ‚เพฒเฝ„เฝฆเผ‹เฝฃเฝฆเผ‹เฝฃเพทเฝ‚เผ‹เฝ“เฝดเฝ‚"
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝขเพŸเฝบเฝ“เผ‹เฝ เฝ–เพฒเฝบเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝšเฝดเผ‹เฝ–เฝŸเฝผเผ‹เฝฆเพฆเพฑเฝผเฝขเผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝ เฝฒเผ‹เฝ–เฝฆเพ’เฝ„เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹ %s %s เผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เผ‹เฝเฝผเฝ–เผ‹เฝ”เฝฆเผ"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เพฑเฝฒเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹%sเผ‹เฝ‘เฝบเผ‹เฝ„เฝผเผ‹เฝ–เฝคเฝดเฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹เฝšเฝดเผ‹เฝฃเพทเฝ‚เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ–เพฑเฝฒเฝ“เผ‹เฝ˜เฝฒเผ‹เฝšเฝดเผ‹เฝ–เฝฆเพกเฝดเผ‹เฝฃเฝบเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO เฝ เฝ›เฝผเฝฃเผ‹เฝ–เผ‹เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝ เฝ‘เพฒเผ‹เฝ˜เฝ›เฝผเฝ‘เผ‹เฝฆเพฒเฝดเฝ„เผ‹เฝ–เฝžเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
@@ -2963,54 +3006,54 @@ msgstr "%s (%s -> %s)เฝ–เฝฆเพเพฑเฝขเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ–เฝเฝ‚เฝฆเผ‹เฝ“เฝฒเผ‹เฝ เฝ
 msgid "MD5Sum mismatch"
 msgstr "เฝจเฝบเฝ˜เผ‹เฝŒเฝฒเผ‹เผฅเผ‹ เฝเพฑเฝผเฝ“เผ‹เฝ–เฝฆเพกเฝผเฝ˜เฝฆเผ‹เฝ˜เผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ”เผ"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "เฝจเฝบเฝ˜เผ‹เฝŒเฝฒเผ‹เผฅเผ‹ เฝเพฑเฝผเฝ“เผ‹เฝ–เฝฆเพกเฝผเฝ˜เฝฆเผ‹เฝ˜เผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ”เผ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (เผกเผ‹)เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ‘เฝ”เพฑเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "เฝ เฝผเฝ‚เผ‹เฝ‚เฝฒเผ‹ เฝจเฝ เฝฒเผ‹เฝŒเฝฒเผ‹เผ‹ เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝšเฝดเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ˜เฝฒเผ‹เฝ‘เฝ˜เฝ„เผ‹เฝ‚เฝฒเผ‹เฝฃเพกเฝบเผ‹เฝ˜เฝฒเฝ‚เผ‹เฝ เฝ‘เฝฒเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ˜เฝฒเผ‹เฝšเฝดเฝ‚เฝฆเผ‹เฝ”เฝฆ:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3019,7 +3062,7 @@ msgstr ""
 " %sเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ„เผ‹เผ‹เฝ‚เฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เผ‹เฝกเฝผเฝ‘เผ‹เฝ เฝšเฝผเฝฃเผ‹เฝ˜เฝฒเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ”เฝฆเผ เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝฃเฝฆเผ‹เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝฃเฝ‚เผ‹เฝเฝผเฝ‚เผ‹เฝฃเฝฆเผ‹ "
 "เฝ เผ‹เฝ“เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ‹เฝฆเฝบเฝฃเผ‹เฝ‘เฝ‚เฝผเฝ”เผ‹เฝ เฝ‘เฝดเฝ‚ (arch เฝ เฝ‘เฝฒเผ‹เฝ–เพฑเฝฒเฝ‚เผ‹เฝฆเฝผเฝ„เฝ˜เผ‹เฝฃเฝฆเผ‹เฝ–เฝขเพŸเฝบเฝ“เผ)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3028,38 +3071,38 @@ msgstr ""
 " %sเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ„เผ‹เผ‹เฝ‚เฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ‚เผ‹เฝกเฝผเฝ‘เผ‹เฝ เฝšเฝผเฝฃเผ‹เฝ˜เฝฒเผ‹เฝ เฝเฝผเฝ–เผ‹เฝ”เฝฆเผ เฝ เฝ‘เฝฒเผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝฃเฝฆเผ‹เฝเพฑเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝฃเฝ‚เผ‹เฝเฝผเฝ‚เผ‹เฝฃเฝฆเผ‹ "
 "เฝ เผ‹เฝ“เฝฒเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ เฝ‘เฝฒเผ‹เฝ‚เฝฒเผ‹เฝ‘เฝ€เฝ เผ‹เฝ„เฝฃเผ‹เฝฆเฝบเฝฃเผ‹เฝ‘เฝ‚เฝผเฝ”เผ‹เฝ เฝ‘เฝดเฝ‚ "
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹ เฝŸเฝดเฝขเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝšเฝดเผ‹เฝ„เฝ“เผ‹เฝ…เฝ“เผ‹เฝ เฝ‚เพฑเฝผเผ‹เฝ“เฝดเฝ‚  เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ€เพฑเฝฒเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ˜เฝฒเฝ“เผ‹เฝ เฝ‘เฝดเฝ‚: %sเผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เพฑเฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝฆเผ‹เฝฆเพ’เฝผเผ"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "เฝšเฝ‘เผ‹เฝ˜เผ‹เฝ˜เฝเฝดเฝ“เผ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "%s (เผกเผ‹)เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ‘เฝ”เพฑเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "%sเผ‹เฝ‚เฝฒเผ‹เฝšเฝ–เผ‹เฝฃเฝดเผ‹%sเผ‹เฝฆเฝบเฝฃเผ‹เฝ เฝเฝดเผ‹เฝ เฝ–เฝ‘เผ‹เฝ“เฝฒเผ‹เฝฆเฝบเฝ˜เฝฆเผ‹เฝเฝขเผ‹เฝ–เฝžเฝ‚\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "%sเผ‹เฝเผ‹เฝ•เพฑเฝผเฝ‚เฝฆเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ“เฝ„เผ‹เฝ“เฝดเฝฆเผ‹เฝ˜เฝบเฝ‘เผ‹เฝ‚เพฒเฝฃเผ‹เฝเฝฒเฝ‚"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "%s (เผกเผ‹)เผ‹เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝ˜เฝฒเฝ„เผ‹เฝ‘เฝ”เพฑเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
@@ -3087,7 +3130,7 @@ msgstr "เฝ„เฝผเฝฆเผ‹เฝ เฝ›เฝฒเฝ“เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผ.."
 msgid "Stored label: %s\n"
 msgstr "เฝ‚เฝฆเฝผเฝ‚เผ‹เฝ เฝ‡เฝผเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝเผ‹เฝกเฝฒเฝ‚:%s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "เฝฆเฝฒเผ‹เฝŒเฝฒเผ‹-เฝขเฝผเฝ˜เผ‹เฝฆเพฆเพฑเฝขเผ‹เฝ–เฝขเพฉเฝบเฝ‚เฝฆเผ‹เฝ˜เผ‹เฝ เฝ–เฝ‘เผ‹เฝ–เฝขเผ‹เฝ–เฝžเฝ‚เผ‹เฝ‘เฝผ..."
@@ -3148,30 +3191,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "เฝเฝดเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝฃเผ‹เฝ‚เพฑเฝฒเฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹เฝšเฝดเผ‹เฝ เฝ‘เพฒเผ‹เฝ–เฝคเฝดเฝฆเผ‹เฝขเพเพฑเฝ–เผ‹เฝ‘เฝผ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝ€เพฑเฝฒเผ‹เฝเฝผเผ‹เฝกเฝฒเฝ‚เผ‹เฝ‚เฝฆเฝขเฝ”เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ เฝ–เพฒเฝฒเผ‹เฝ‘เฝผเผ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "เฝ เผ‹เฝ“เฝฒเผ‹ เฝŒเฝฒเฝฆเฝฒเฝ€เผ‹เฝ‚เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹ เฝ เฝ–เพฑเฝดเฝ„เผ‹เฝเฝดเฝ„เฝฆเผ‹เฝงเพฒเฝฒเฝฃเผ‹เฝ–เฝดเผ‹เฝšเฝดเผ‹:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%iเผ‹เฝ‘เพฒเฝ“เผ‹เฝ˜เฝเฝผเผ‹เฝ‘เฝบเผ‹เฝšเฝดเผ‹เฝ–เพฒเฝฒเฝฆเผ‹เฝกเฝผเฝ‘เผ\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i เฝ–เพฑเฝฒเฝ‚เผ‹เฝ เฝ‚เพฑเฝผเผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝšเฝดเผ‹เฝ‘เฝ„เผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝเฝขเผ‹ %i เฝ‘เพฒเฝ“เผ‹เฝเฝผเผ‹เฝ เฝ‘เฝฒเผ‹เฝšเฝดเผ‹เฝ–เพฒเฝฒเฝฆเผ‹เฝกเฝผเฝ‘เผ\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%iเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ˜เฝบเฝ‘เฝ”เผ‹เฝ”เฝ เฝฒเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝšเฝดเผ‹เฝ‘เฝ„เผ‹เฝ‚เฝ…เฝฒเฝ‚เผ‹เฝเฝขเผ‹ %iเผ‹เฝ‘เพฒเฝ“เผ‹เฝเฝผเผ‹เฝšเฝดเผ‹เฝ–เพฒเฝฒเฝฆเผ‹เฝ–เฝžเฝ‚เผ‹เฝกเฝผเฝ‘เฝ”เผ‹เฝจเฝฒเฝ“เผ\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3188,17 +3231,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "เฝจเฝบเฝ˜เผ‹เฝŒเฝฒเผ‹เผฅเผ‹ เฝเพฑเฝผเฝ“เผ‹เฝ–เฝฆเพกเฝผเฝ˜เฝฆเผ‹เฝ˜เผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ”เผ"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ–เฝขเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3262,119 +3294,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹%sเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%sเผ‹เฝขเฝฒเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%sเผ‹เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ‚เฝเฝ„เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s เฝ˜เฝ‡เฝดเฝ‚เผ‹เฝ–เฝฆเพกเฝดเฝเผ‹เฝฆเพฆเฝบเผ‹เฝขเฝ„เผ‹เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ–เฝเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "เฝเฝผเผ‹เฝ–เฝ€เฝผเฝ‘เผ‹เฝ เฝ–เฝ‘เผ‹เฝ˜เฝฒเผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝเฝผเผ‹%sเผ‹เฝ†เผ‹เฝคเฝฆเผ‹เฝ เฝ‘เฝฒเผ‹เฝ–เฝขเพณเฝ‚เผ‹เฝฆเพŸเฝผเฝขเผ‹เฝŸเฝดเฝ‚เฝฆเผ‹เฝเฝบเผ‹เฝ เฝ‘เฝดเฝ‚"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%sเผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ˜เผ‹เฝšเฝดเฝ‚เฝฆเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%sเผ‹ เฝ‚เพฒเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr " %sเผ‹ เฝ‚เฝฒเผ‹เฝฆเพฆเฝดเฝ„เผ‹เฝšเฝ“เผ‹เฝ–เฝŸเฝผเผ‹เฝ–เฝคเฝผเฝฃเผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%sเผ‹ เฝขเฝฒเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝฃเฝดเผ‹เฝ‚เพฒเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "เฝ‚เฝžเฝฒเผ‹เฝ–เฝ™เฝดเฝ‚เฝฆเผ‹เฝ เฝ–เฝ‘เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹%sเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%sเผ‹ เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ‚เฝเฝ„เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ‚เพฒเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ–เฝเฝ„เผ‹เฝกเฝผเฝ‘เผ‹เฝ”เฝ เฝฒเผ‹%s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s เฝ˜เฝ‡เฝดเฝ‚เผ‹เฝ–เฝฆเพกเฝดเฝเผ‹เฝฆเพฆเฝบเผ‹เฝขเฝ„เผ‹เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ‚เฝเฝ„เผ‹เฝ“เฝฒเฝ เฝฒเผ‹เฝ‘เฝผเฝ“เผ‹เฝฃเฝดเผ‹เฝ‚เพฒเผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝ เฝ–เฝ‘เผ‹เฝ‘เฝผเผ"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s เฝ˜เฝ‡เฝดเฝ‚เผ‹เฝ–เฝฆเพกเฝดเฝเผ‹เฝฆเพฆเฝบเผ‹เฝขเฝ„เผ‹เฝขเพฉเผ‹เฝ–เฝฆเพเพฒเฝ‘เผ‹เฝ–เฝเฝ„เผ‹เฝกเฝผเฝ‘เผ"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3386,13 +3418,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3422,14 +3448,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "'%s:%s' (%i)เผ‹เฝ˜เฝผเฝฆเผ‹เฝ˜เฝเฝดเฝ“เผ‹เฝ เฝ–เฝ‘เฝเผ‹เฝ‘เผ‹เฝ„เฝ“เผ‹เฝ”เผ‹เฝ…เฝฒเฝ‚เผ‹เฝ–เพฑเฝดเฝ„เผ‹เฝกเฝฒเผ"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... เฝ เฝ–เฝ‘เผ‹เฝšเฝขเผ‹เฝกเฝผเฝ‘เผ"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "เฝขเฝฒเฝ˜เผ‹เฝฆเพ’เพฒเฝฒเฝ‚เผ‹เฝกเฝฒเฝ‚เผ‹เฝฆเพฃเฝผเฝ‘เผ‹%sเผ‹เฝ เฝ‘เฝฒเผ‹เฝเผ‹เฝ•เพฑเฝบเผ‹เฝ‘เฝผเผ"
 
diff --git a/po/el.po b/po/el.po
index 0a7becfc7..305e2f1d3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: ฮ˜ฮฑฮฝฮฌฯƒฮทฯ‚ ฮฮฌฯ„ฯƒฮทฯ‚ <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -106,73 +106,73 @@ msgstr "ฮฃฯ…ฮฝฮฟฮปฮนฮบฯŒฯ‚ ฮšฮฑฯ„ฮฑฮผฮตฯ„ฯฮทฮผฮญฮฝฮฟฯ‚ ฮงฯŽฯฮฟฯ‚: "
 msgid "Package file %s is out of sync."
 msgstr "ฮคฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮตฮฝฮทฮผฮตฯฯ‰ฮผฮญฮฝฮฟ."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ฮ”ฮต ฮฒฯฮญฮธฮทฮบฮฑฮฝ ฯ€ฮฑฮบฮญฯ„ฮฑ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "ฮ ฯฮญฯ€ฮตฮน ฮฝฮฑ ฮดฯŽฯƒฮตฯ„ฮต ฯ„ฮฟฯ…ฮปฮฌฯ‡ฮนฯƒฯ„ฮฟฮฝ ฮญฮฝฮฑ ฮผฮฟฯ„ฮฏฮฒฮฟ ฮฑฮฝฮฑฮถฮฎฯ„ฮทฯƒฮทฯ‚"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ฮ‘ฮดฯ…ฮฝฮฑฮผฮฏฮฑ ฮตฮฝฯ„ฮฟฯ€ฮนฯƒฮผฮฟฯ ฯ„ฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ฮ‘ฯฯ‡ฮตฮฏฮฑ ฮ ฮฑฮบฮญฯ„ฮฟฯ…:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "ฮ— cache ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮตฮฝฮทฮผฮตฯฯ‰ฮผฮญฮฝฮท, ฮฑฮดฯ…ฮฝฮฑฮผฮฏฮฑ ฯ€ฮฑฯฮฑฯ€ฮฟฮผฯ€ฮฎฯ‚ ฯƒฮต ฮญฮฝฮฑ ฮฑฯฯ‡ฮตฮฏฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟฯ…"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ฮšฮฑฮธฮทฮปฯ‰ฮผฮญฮฝฮฑ ฮ ฮฑฮบฮญฯ„ฮฑ:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ฮดฮต ฮฒฯฮญฮธฮทฮบฮฑฮฝ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ฮ•ฮณฮบฮฑฯ„ฮตฯƒฯ„ฮทฮผฮญฮฝฮฑ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ฮฅฯ€ฮฟฯˆฮฎฯ†ฮนฮฟ: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ฮบฮฑฮฝฮญฮฝฮฑ)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr " ฮšฮฑฮธฮฎฮปฯ‰ฯƒฮท ฮ ฮฑฮบฮญฯ„ฮฟฯ…: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ฮ ฮฏฮฝฮฑฮบฮฑฯ‚ ฮˆฮบฮดฮฟฯƒฮทฯ‚:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ฮณฮนฮฑ %s ฮตฮฏฮฝฮฑฮน ฮผฮตฯ„ฮฑฮณฮปฯ‰ฯ„ฯ„ฮนฯƒฮผฮญฮฝฮฟ ฯƒฮต %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -247,21 +247,29 @@ msgstr ""
 "  -o=? ฮงฯฮฎฯƒฮท ฮผฮนฮฑฯ‚ ฮฑฯ…ฮธฮฑฮฏฯฮตฯ„ฮท ฮตฯ€ฮนฮปฮฟฮณฮฎฯ‚ ฯฯ…ฮธฮผฮฏฯƒฮตฯ‰ฮฝ, ฯ€ฯ‡ -o dir::cache=/tmp\n"
 "ฮ”ฮตฮฏฯ„ฮต ฯ„ฮนฯ‚ ฯƒฮตฮปฮฏฮดฮตฯ‚ man ฯ„ฮฟฯ… apt-cache(8) ฮบฮฑฮน apt.conf(5) ฮณฮนฮฑ ฯ€ฮปฮทฯฮฟฯ†ฮฟฯฮฏฮตฯ‚.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "ฮ ฮฑฯฮฑฮบฮฑฮปฯŽ ฮดฯŽฯƒฯ„ฮต ฮญฮฝฮฑ ฯŒฮฝฮฟฮผฮฑ ฮณฮนฮฑ ฮฑฯ…ฯ„ฯŒฮฝ ฯ„ฮฟฮฝ ฮดฮฏฯƒฮบฮฟ, ฯŒฯ€ฯ‰ฯ‚ 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ฮ ฮฑฯฮฑฮบฮฑฮปฯŽ ฮตฮนฯƒฮฌฮณฮตฯ„ฮต ฯ„ฮฟ ฮดฮฏฯƒฮบฮฟ ฯƒฯ„ฮท ฯƒฯ…ฯƒฮบฮตฯ…ฮฎ ฮบฮฑฮน ฯ€ฮฑฯ„ฮฎฯƒฯ„ฮต enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฯƒฯฮฝฮดฮตฯƒฮทฯ‚ ฯ„ฮฟฯ… %s ฯƒฮต %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ฮ•ฯ€ฮฑฮฝฮฑฮปฮฌฮฒฮตฯ„ฮต ฯ„ฮทฮฝ ฮดฮนฮฑฮดฮนฮบฮฑฯƒฮฏฮฑ ฮณฮนฮฑ ฯ„ฮฑ ฯ…ฯ€ฯŒฮปฮฟฮนฯ€ฮฑ CD ฮฑฯ€ฯŒ ฯ„ฮฟ ฯƒฮตฯ„ ฯƒฮฑฯ‚."
 
@@ -501,7 +509,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "ฯ„ฮฟ %s ฮตฮฏฮฝฮฑฮน ฮฎฮดฮท ฮท ฯ„ฮตฮปฮตฯ…ฯ„ฮฑฮฏฮฑ ฮญฮบฮดฮฟฯƒฮท.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ฯ„ฮฟ %s ฮญฯ‡ฮตฮน ฮตฮณฮบฮฑฯ„ฮฑฯƒฯ„ฮฑฮธฮตฮฏ ฮผฮต ฯ„ฮฟ ฯ‡ฮญฯฮน\n"
@@ -614,8 +622,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ฮœฮตฯ„ฮฌ ฮฑฯ€ฯŒ ฮฑฯ…ฯ„ฮฎ ฯ„ฮท ฮปฮตฮนฯ„ฮฟฯ…ฯฮณฮฏฮฑ, ฮธฮฑ ฮตฮปฮตฯ…ฮธฮตฯฯ‰ฮธฮฟฯฮฝ %sB ฯ‡ฯŽฯฮฟฯ… ฮฑฯ€ฯŒ ฯ„ฮฟ ฮดฮฏฯƒฮบฮฟ.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ฮ”ฮตฮฝ ฮผฯ€ฯŒฯฮตฯƒฮฑ ฮฝฮฑ ฯ€ฯฮฟฯƒฮดฮนฮฟฯฮฏฯƒฯ‰ ฯ„ฮฟฮฝ ฮตฮปฮตฯฮธฮตฯฮฟ ฯ‡ฯŽฯฮฟ ฯƒฯ„ฮฟ %s"
@@ -654,7 +662,7 @@ msgstr "ฮ•ฮณฮบฮฑฯ„ฮฌฮปฮตฮนฯˆฮท."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ฮ˜ฮญฮปฮตฯ„ฮต ฮฝฮฑ ฯƒฯ…ฮฝฮตฯ‡ฮฏฯƒฮตฯ„ฮต [ฮ/ฮฟ]; "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฮฝฮฌฮบฯ„ฮทฯƒฮทฯ‚ ฯ„ฮฟฯ… %s   %s\n"
@@ -663,7 +671,7 @@ msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฮฝฮฌฮบฯ„ฮทฯƒฮทฯ‚ ฯ„ฮฟฯ… %s   %s\n"
 msgid "Some files failed to download"
 msgstr "ฮ“ฮนฮฑ ฮผฮตฯฮนฮบฮฌ ฮฑฯฯ‡ฮตฮฏฮฑ ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต ฮท ฮผฮตฯ„ฮฑฯ†ฯŒฯฯ„ฯ‰ฯƒฮท"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ฮŸฮปฮฟฮบฮปฮทฯฯŽฮธฮทฮบฮต ฮท ฮผฮตฯ„ฮฑฯ†ฯŒฯฯ„ฯ‰ฯƒฮท ฮผฯŒฮฝฮฟ"
 
@@ -745,7 +753,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ฮŸฮน ฮฑฮบฯŒฮปฮฟฯ…ฮธฮตฯ‚ ฯ€ฮปฮทฯฮฟฯ†ฮฟฯฮฏฮตฯ‚ ฮฏฯƒฯ‰ฯ‚ ฮฒฮฟฮทฮธฮฎฯƒฮฟฯ…ฮฝ ฯƒฯ„ฮทฮฝ ฮตฯ€ฮฏฮปฯ…ฯƒฮท ฯ„ฮฟฯ… ฯ€ฯฮฟฮฒฮปฮฎฮผฮฑฯ„ฮฟฯ‚:"
 
@@ -795,7 +803,7 @@ msgstr ""
 "ฮ‘ฮฝฮตฯ€ฮฏฮปฯ…ฯ„ฮตฯ‚ ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚. ฮ”ฮฟฮบฮนฮผฮฌฯƒฯ„ฮต 'apt-get -f install' ฯ‡ฯ‰ฯฮฏฯ‚ ฮฝฮฑ ฮฟฯฮฏฯƒฮตฯ„ฮต "
 "ฯ€ฮฑฮบฮญฯ„ฮฟ (ฮฎ ฮบฮฑฮธฮฟฯฮฏฯƒฯ„ฮต ฮผฮนฮฑ ฮปฯฯƒฮท)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -807,89 +815,89 @@ msgstr ""
 "ฮดฮนฮฑฮฝฮฟฮผฮฎ, ฯŒฯ„ฮน ฮผฮตฯฮนฮบฮฌ ฮฑฯ€ฯŒ ฯ„ฮฑ ฯ€ฮฑฮบฮญฯ„ฮฑ ฮดฮตฮฝ ฮญฯ‡ฮฟฯ…ฮฝ ฮฑฮบฯŒฮผฮฑ ฮดฮทฮผฮนฮฟฯ…ฯฮณฮทฮธฮตฮฏ ฮฎ ฮญฯ‡ฮฟฯ…ฮฝ\n"
 "ฮผฮตฯ„ฮฑฮบฮนฮฝฮทฮธฮตฮฏ ฮฑฯ€ฯŒ ฯ„ฮฑ ฮตฮนฯƒฮตฯฯ‡ฯŒฮผฮตฮฝฮฑ."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ฮงฮฑฮปฮฑฯƒฮผฮญฮฝฮฑ ฯ€ฮฑฮบฮญฯ„ฮฑ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ฮคฮฑ ฮฑฮบฯŒฮปฮฟฯ…ฮธฮฑ ฮตฯ€ฮนฯ€ฮปฮญฮฟฮฝ ฯ€ฮฑฮบฮญฯ„ฮฑ ฮธฮฑ ฮตฮณฮบฮฑฯ„ฮฑฯƒฯ„ฮฑฮธฮฟฯฮฝ:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ฮ ฯฮฟฯ„ฮตฮนฮฝฯŒฮผฮตฮฝฮฑ ฯ€ฮฑฮบฮญฯ„ฮฑ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ฮฃฯ…ฮฝฮนฯƒฯ„ฯŽฮผฮตฮฝฮฑ ฯ€ฮฑฮบฮญฯ„ฮฑ:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ฯ„ฮฟ %s ฮญฯ‡ฮตฮน ฮตฮณฮบฮฑฯ„ฮฑฯƒฯ„ฮฑฮธฮตฮฏ ฮฑฯ…ฯ„ฯŒฮผฮฑฯ„ฮฑ\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ฮฅฯ€ฮฟฮปฮฟฮณฮนฯƒฮผฯŒฯ‚ ฯ„ฮทฯ‚ ฮฑฮฝฮฑฮฒฮฌฮธฮผฮนฯƒฮทฯ‚... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ฮ‘ฯ€ฮญฯ„ฯ…ฯ‡ฮต"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ฮ•ฯ„ฮฟฮนฮผฮฟ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "ฮ•ฯƒฯ‰ฯ„ฮตฯฮนฮบฯŒ ฮฃฯ†ฮฌฮปฮผฮฑ, ฮท ฯ€ฯฮฟฯƒฯ€ฮฌฮธฮตฮนฮฑ ฮตฯ€ฮฏฮปฯ…ฯƒฮทฯ‚ ฯ„ฮฟฯ… ฯ€ฯฮฟฮฒฮปฮฎฮผฮฑฯ„ฮฟฯ‚ \"ฮญฯƒฯ€ฮฑฯƒฮต\" ฮบฮฌฯ€ฮฟฮนฮฟ "
 "ฯ…ฮปฮนฮบฯŒ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮบฮปฮตฮฏฮดฯ‰ฮผฮฑ ฯ„ฮฟฯ… ฮบฮฑฯ„ฮฑฮปฯŒฮณฮฟฯ… ฮผฮตฯ„ฮฑฯ†ฯŒฯฯ„ฯ‰ฯƒฮทฯ‚"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ฮ˜ฮฑ ฯ€ฯฮญฯ€ฮตฮน ฮฝฮฑ ฮบฮฑฮธฮฟฯฮฏฯƒฮตฯ„ฮต ฯ„ฮฟฯ…ฮปฮฌฯ‡ฮนฯƒฯ„ฮฟฮฝ ฮญฮฝฮฑ ฯ€ฮฑฮบฮญฯ„ฮฟ ฮณฮนฮฑ ฮฝฮฑ ฮผฮตฯ„ฮฑฯ†ฮฟฯฯ„ฯŽฯƒฮตฯ„ฮต ฯ„ฮฟฮฝ "
 "ฮบฯ‰ฮดฮนฮบฮฌฯ„ฮฟฯ…"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ฮ‘ฮดฯ…ฮฝฮฑฮผฮฏฮฑ ฮตฮฝฯ„ฮฟฯ€ฮนฯƒฮผฮฟฯ ฯ„ฮฟฯ… ฮบฯŽฮดฮนฮบฮฌ ฯ„ฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -897,86 +905,86 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ฮ ฮฑฯฮฌฮบฮฑฮผฯˆฮท ฯ„ฮฟฯ… ฮฎฮดฮท ฮผฮตฯ„ฮฑฯ†ฮฟฯฯ„ฯ‰ฮผฮญฮฝฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… `%s`\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ฮ”ฮตฮฝ ฮดฮนฮฑฮธฮญฯ„ฮตฯ„ฮต ฮฑฯฮบฮตฯ„ฯŒ ฮตฮปฮตฯฮธฮตฯฮฟ ฯ‡ฯŽฯฮฟ ฯƒฯ„ฮฟ %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ฮงฯฮตฮนฮฌฮถฮตฯ„ฮฑฮน ฮฝฮฑ ฮผฮตฯ„ฮฑฯ†ฮฟฯฯ„ฯ‰ฮธฮฟฯฮฝ %sB/%sB ฯ€ฮทฮณฮฑฮฏฮฟฯ… ฮบฯŽฮดฮนฮบฮฑ.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ฮงฯฮตฮนฮฌฮถฮตฯ„ฮฑฮน ฮฝฮฑ ฮผฮตฯ„ฮฑฯ†ฮฟฯฯ„ฯ‰ฮธฮฟฯฮฝ %sB ฯ€ฮทฮณฮฑฮฏฮฟฯ… ฮบฯŽฮดฮนฮบฮฑ.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ฮœฮตฯ„ฮฑฯ†ฯŒฯฯ„ฯ‰ฯƒฮท ฮšฯ‰ฮดฮนฮบฮฑ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮผฮตฯ„ฮฑฯ†ฯŒฯฯ„ฯ‰ฯƒฮทฯ‚ ฮผฮตฯฮนฮบฯŽฮฝ ฮฑฯฯ‡ฮตฮนฮฟฮธฮทฮบฯŽฮฝ."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "ฮ ฮฑฯฮฌฮบฮฑฮผฯˆฮท ฯ„ฮทฯ‚ ฮฑฯ€ฮฟฯƒฯ…ฮผฯ€ฮฏฮตฯƒฮทฯ‚ ฮฎฮดฮท ฮผฮตฯ„ฮฑฯ†ฮฟฯฯ„ฯ‰ฮผฮญฮฝฮฟฯ… ฮบฯŽฮดฮนฮบฮฑ ฯƒฯ„ฮฟ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ฮ‘ฯ€ฮญฯ„ฯ…ฯ‡ฮต ฮท ฮตฮฝฯ„ฮฟฮปฮฎ ฮฑฯ€ฮฟฯƒฯ…ฮผฯ€ฮฏฮตฯƒฮทฯ‚ %s\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ฮ•ฮปฮญฮณฮพฯ„ฮต ฮฑฮฝ ฮตฮฏฮฝฮฑฮน ฮตฮณฮบฮฑฯ„ฮฑฯƒฯ„ฮทฮผฮญฮฝฮฟ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ฮ‘ฯ€ฮญฯ„ฯ…ฯ‡ฮต ฮท ฮตฮฝฯ„ฮฟฮปฮฎ ฯ‡ฯ„ฮนฯƒฮฏฮผฮฑฯ„ฮฟฯ‚ %s.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ฮ— ฮฑฯ€ฮฟฮณฮฟฮฝฮนฮบฮฎ ฮดฮนฮตฯฮณฮฑฯƒฮฏฮฑ ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ฮ˜ฮฑ ฯ€ฯฮญฯ€ฮตฮน ฮฝฮฑ ฮบฮฑฮธฮฟฯฮฏฯƒฮตฯ„ฮต ฯ„ฮฟฯ…ฮปฮฌฯ‡ฮนฯƒฯ„ฮฟฮฝ ฮญฮฝฮฑ ฯ€ฮฑฮบฮญฯ„ฮฟ ฮณฮนฮฑ ฮญฮปฮตฮณฯ‡ฮฟ ฯ„ฯ‰ฮฝ ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฯ‰ฮฝ ฯ„ฮฟฯ…"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ€ฮปฮทฯฮฟฯ†ฮฟฯฮนฯŽฮฝ ฯ‡ฯ„ฮนฯƒฮฏฮผฮฑฯ„ฮฟฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "ฯ„ฮฟ %s ฮดฮตฮฝ ฮญฯ‡ฮตฮน ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚ ฯ‡ฯ„ฮนฯƒฮฏฮผฮฑฯ„ฮฟฯ‚.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -985,7 +993,7 @@ msgstr ""
 "%s ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s ฮดฮตฮฝ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮนฮฟฯฮฝฯ„ฮฑฮน ฮตฯ€ฮตฮนฮดฮฎ ฯ„ฮฟ %s ฮดฮตฮฝ ฮตฯ€ฮนฯ„ฯฮญฯ€ฮตฯ„ฮฑฮน ฯƒฯ„ฮฟ "
 "ฯ€ฮฑฮบฮญฯ„ฮฟ %s"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -993,14 +1001,14 @@ msgid ""
 msgstr ""
 "%s ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s ฮดฮตฮฝ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮนฮฟฯฮฝฯ„ฮฑฮน ฮตฯ€ฮตฮนฮดฮฎ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s ฮดฮตฮฝ ฮฒฯฮญฮธฮทฮบฮต"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮฏฮทฯƒฮทฯ‚ %s ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฯ‰ฮฝ ฮณฮนฮฑ ฯ„ฮฟ %s: ฮคฮฟ ฮตฮณฮบฮฑฯ„ฮตฯƒฯ„ฮทฮผฮญฮฝฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s "
 "ฮตฮฏฮฝฮฑฮน ฮฝฮตฯŽฯ„ฮตฯฮฟ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1009,7 +1017,7 @@ msgstr ""
 "%s ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s ฮดฮตฮฝ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮนฮฟฯฮฝฯ„ฮฑฮน ฮตฯ€ฮตฮนฮดฮฎ ฮดฮตฮฝ ฯ…ฯ€ฮฌฯฯ‡ฮฟฯ…ฮฝ ฮดฮนฮฑฮธฮญฯƒฮนฮผฮตฯ‚ "
 "ฮตฮบฮดฯŒฯƒฮตฮนฯ‚ ฯ„ฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s ฯ€ฮฟฯ… ฮฝฮฑ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮนฮฟฯฮฝ ฯ„ฮนฯ‚ ฮฑฯ€ฮฑฮนฯ„ฮฎฯƒฮตฮนฯ‚ ฯ„ฮทฯ‚ ฮญฮบฮดฮฟฯƒฮทฯ‚"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1018,30 +1026,30 @@ msgstr ""
 "%s ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s ฮดฮตฮฝ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮนฮฟฯฮฝฯ„ฮฑฮน ฮตฯ€ฮตฮนฮดฮฎ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s ฮดฮตฮฝ ฮญฯ‡ฮตฮน "
 "ฯ…ฯ€ฮฟฯˆฮฎฯ†ฮนฮฑฮญฮบฮดฮฟฯƒฮท"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮฏฮทฯƒฮทฯ‚ %s ฮตฮพฮฌฯฯ„ฮทฯƒฮทฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ฮŸฮน ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฮนฯ‚ ฯ‡ฯ„ฮนฯƒฮฏฮผฮฑฯ„ฮฟฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s ฮดฮตฮฝ ฮนฮบฮฑฮฝฮฟฯ€ฮฟฮนฮฟฯฮฝฯ„ฮฑฮน."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮตฯ€ฮตฮพฮตฯฮณฮฑฯƒฮฏฮฑฯ‚ ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฯ‰ฮฝ ฯ‡ฯ„ฮนฯƒฮฏฮผฮฑฯ„ฮฟฯ‚"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog ฮณฮนฮฑ %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ฮฅฯ€ฮฟฯƒฯ„ฮทฯฮนฮถฯŒฮผฮตฮฝฮฟฮน ฮŸฮดฮทฮณฮฟฮฏ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1126,7 +1134,7 @@ msgstr ""
 "ฮณฮนฮฑ ฯ€ฮตฯฮนฯƒฯƒฯŒฯ„ฮตฯฮตฯ‚ ฯ€ฮปฮทฯฮฟฯ†ฮฟฯฮฏฮตฯ‚ ฮบฮฑฮน ฮตฯ€ฮนฮปฮฟฮณฮญฯ‚.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1197,7 +1205,8 @@ msgid "%s was already not hold.\n"
 msgstr "ฯ„ฮฟ %s ฮตฮฏฮฝฮฑฮน ฮฎฮดฮท ฮท ฯ„ฮตฮปฮตฯ…ฯ„ฮฑฮฏฮฑ ฮญฮบฮดฮฟฯƒฮท.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ฮ‘ฮฝฮฑฮผฮฟฮฝฮฎ ฯ„ฮฟฯ… %s, ฮฑฮปฮปฮฌ ฮดฮต ฮฒฯฮนฯƒฮบฯŒฯ„ฮฑฮฝ ฮตฮบฮตฮฏ"
@@ -1335,8 +1344,8 @@ msgstr "ฮ›ฮฎฮพฮท ฯ‡ฯฯŒฮฝฮฟฯ… ฯƒฯฮฝฮดฮตฯƒฮทฯ‚"
 msgid "Server closed the connection"
 msgstr "ฮŸ ฮดฮนฮฑฮบฮฟฮผฮนฯƒฯ„ฮฎฯ‚ ฮญฮบฮปฮตฮนฯƒฮต ฯ„ฮทฮฝ ฯƒฯฮฝฮดฮตฯƒฮท"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮทฯ‚"
 
@@ -1349,8 +1358,8 @@ msgid "Protocol corruption"
 msgstr "ฮ‘ฮปฮปฮฟฮฏฯ‰ฯƒฮท ฯ„ฮฟฯ… ฯ€ฯฯ‰ฯ„ฮฟฮบฯŒฮปฮปฮฟฯ…"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ ฮตฮณฮณฯฮฑฯ†ฮฎฯ‚"
 
@@ -1404,7 +1413,7 @@ msgstr "ฮ›ฮฎฮพฮท ฯ‡ฯฯŒฮฝฮฟฯ… ฯƒฯฮฝฮดฮตฯƒฮทฯ‚ ฯƒฯ„ฮทฮฝ ฯ…ฯ€ฮฟฮดฮฟฯ‡ฮฎ ฮดฮตฮดฮฟฮ
 msgid "Unable to accept connection"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฯ€ฮฟฮดฮฟฯ‡ฮฎ ฯƒฯ…ฮฝฮดฮญฯƒฮตฯ‰ฮฝ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮฟ hashing ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
@@ -1431,90 +1440,103 @@ msgstr "ฮ•ฯ€ฮตฯฯŽฯ„ฮทฯƒฮท"
 msgid "Unable to invoke "
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฮบฯ„ฮญฮปฮตฯƒฮท"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ฮฃฯฮฝฮดฮตฯƒฮท ฯƒฯ„ฮฟ %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮดฮทฮผฮนฮฟฯ…ฯฮณฮฏฮฑ ฯ…ฯ€ฮฟฮดฮฟฯ‡ฮฎฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฯฯ‡ฮนฮบฮฟฯ€ฮฟฮฏฮทฯƒฮท ฯ„ฮทฯ‚ ฯƒฯฮฝฮดฮตฯƒฮทฯ‚ ฯƒฯ„ฮฟ %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฯƒฯฮฝฮดฮตฯƒฮท ฯƒฯ„ฮฟ %s:%s (%s), ฮปฮฎฮพฮท ฯ‡ฯฯŒฮฝฮฟฯ… ฯƒฯฮฝฮดฮตฯƒฮทฯ‚"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฯƒฯฮฝฮดฮตฯƒฮท ฯƒฯ„ฮฟ %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ฮฃฯฮฝฮดฮตฯƒฮท ฯƒฯ„ฮฟ %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ฮ ฯฮฟฯƒฯ‰ฯฮนฮฝฮฎ ฮฑฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฯƒฯ„ฮทฮฝ ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "ฮšฮฌฯ„ฮน ฯ€ฮฑฯฮฌฮพฮตฮฝฮฟ ฯƒฯ…ฮฝฮญฮฒฮท ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… '%s:%s' (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ฮšฮฌฯ„ฮน ฯ€ฮฑฯฮฌฮพฮตฮฝฮฟ ฯƒฯ…ฮฝฮญฮฒฮท ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… '%s:%s' (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฯƒฯฮฝฮดฮตฯƒฮท ฯƒฯ„ฮฟ %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ฮ•ฯƒฯ‰ฯ„ฮตฯฮนฮบฯŒ ฯƒฯ†ฮฌฮปฮผฮฑ: ฮ— ฯ…ฯ€ฮฟฮณฯฮฑฯ†ฮฎ ฮตฮฏฮฝฮฑฮน ฮบฮฑฮปฮฎ, ฮฑฮปฮปฮฌ ฮฑฮดฯ…ฮฝฮฑฮผฮฏฮฑ ฯ€ฯฮฟฯƒฮดฮนฮฟฯฮนฯƒฮผฮฟฯ ฯ„ฮฟฯ… "
 "ฮฑฯ€ฮฟฯ„ฯ…ฯ€ฯŽฮผฮฑฯ„ฮฟฯ‚?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "ฮ’ฯฮญฮธฮทฮบฮต ฯ„ฮฟฯ…ฮปฮฌฯ‡ฮนฯƒฯ„ฮฟฮฝ ฮผฮนฮฑ ฮผฮท ฮญฮณฮบฯ…ฯฮท ฯ…ฯ€ฮฟฮณฯฮฑฯ†ฮฎ."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "ฮ‘ฮดฯ…ฮฝฮฑฮผฮฏฮฑ ฮตฮบฯ„ฮญฮปฮตฯƒฮทฯ‚ ฯ„ฮฟฯ… '%s' ฮณฮนฮฑ ฯ„ฮทฮฝ ฮตฯ€ฮฑฮปฮฎฮธฮตฯ…ฯƒฮท ฯ„ฮทฯ‚ ฯ…ฯ€ฮฟฮณฯฮฑฯ†ฮฎฯ‚ (ฮตฮฏฮฝฮฑฮน "
 "ฮตฮณฮบฮฑฯ„ฮตฯƒฯ„ฮทฮผฮญฮฝฮฟ ฯ„ฮฟ gpgv;)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "ฮ†ฮณฮฝฯ‰ฯƒฯ„ฮฟ ฯƒฯ†ฮฌฮปฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฮบฯ„ฮญฮปฮตฯƒฮท ฯ„ฮฟฯ… gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ฮŸฮน ฯ€ฮฑฯฮฑฮบฮฌฯ„ฯ‰ ฯ…ฯ€ฮฟฮณฯฮฑฯ†ฮญฯ‚ ฮฎฯ„ฮฑฮฝ ฮผฮท ฮญฮณฮบฯ…ฯฮตฯ‚:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1554,54 +1576,54 @@ msgstr "ฮŸ ฮดฮนฮฑฮบฮฟฮผฮนฯƒฯ„ฮฎฯ‚ http ฮดฮตฮฝ ฯ…ฯ€ฮฟฯƒฯ„ฮทฯฮฏฮถฮตฮน ฯ€ฮปฮฎฯฯ‰ฯ
 msgid "Unknown date format"
 msgstr "ฮ†ฮณฮฝฯ‰ฯƒฯ„ฮท ฮผฮฟฯฯ†ฮฎ ฮทฮผฮตฯฮฟฮผฮทฮฝฮฏฮฑฯ‚"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "ฮ— ฮตฯ€ฮนฮปฮฟฮณฮฎ ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ฮ›ฮฎฮพฮท ฯ‡ฯฯŒฮฝฮฟฯ… ฯƒฯฮฝฮดฮตฯƒฮทฯ‚"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ ฯƒฯ„ฮทฮฝ ฮตฮณฮณฯฮฑฯ†ฮฎ ฯƒฯ„ฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ ฮตฮพฯŒฮดฮฟฯ…"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ ฯƒฯ„ฮทฮฝ ฮตฮณฮณฯฮฑฯ†ฮฎ ฯƒฯ„ฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ ฯƒฯ„ฮทฮฝ ฮตฮณฮณฯฮฑฯ†ฮฎ ฯƒฯ„ฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "ฮฃฯ†ฮฌฮปฮผฮฑ ฯƒฯ„ฮทฮฝ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฮฑฯ€ฯŒ ฯ„ฮฟ ฮดฮนฮฑฮบฮฟฮผฮนฯƒฯ„ฮฎ, ฯ„ฮฟ ฮฌฮปฮปฮฟ ฮฌฮบฯฮฟ ฮญฮบฮปฮตฮนฯƒฮต ฯ„ฮท ฯƒฯฮฝฮดฮตฯƒฮท"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ ฯƒฯ„ฮทฮฝ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฮฑฯ€ฯŒ ฯ„ฮฟ ฮดฮนฮฑฮบฮฟฮผฮนฯƒฯ„ฮฎ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ฮ•ฮปฮฑฯ„ฯ„ฯ‰ฮผฮฑฯ„ฮนฮบฮฌ ฮดฮตฮดฮฟฮผฮญฮฝฮฑ ฮตฯ€ฮนฮบฮตฯ†ฮฑฮปฮฏฮดฮฑฯ‚"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ฮ— ฯƒฯฮฝฮดฮตฯƒฮท ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ฮ•ฯƒฯ‰ฯ„ฮตฯฮนฮบฯŒ ฮฃฯ†ฮฌฮปฮผฮฑ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฯ„ฮฟฯ… %s"
@@ -1628,7 +1650,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1724,7 +1751,7 @@ msgstr ""
 "  -c=? ฮ‘ฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฮฑฯ…ฯ„ฮฟฯ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯฯ…ฮธฮผฮฏฯƒฮตฯ‰ฮฝ\n"
 "  -o=? ฮšฮฑฮธฮฟฯฮนฯƒฮผฯŒฯ‚ ฮฑฯ…ฮธฮฑฮฏฯฮตฯ„ฮทฯ‚ ฮตฯ€ฮนฮปฮฟฮณฮฎฯ‚ ฯ€ฮฑฯฮฑฮผฮญฯ„ฯฮฟฯ…, ฯ€ฯ‡ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฮณฮณฯฮฑฯ†ฮฎ ฯƒฯ„ฮฟ %s"
@@ -1874,8 +1901,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "ฮคฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฌ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯ„ฮทฯ‚ ฮฒฮฌฯƒฮทฯ‚ %s: %s ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮตฯฯฮตฯƒฮทฯ‚ ฯ„ฮทฯ‚ ฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚ ฯ„ฮฟฯ… %s."
@@ -1888,87 +1915,87 @@ msgstr "ฮ— ฮฑฯฯ‡ฮตฮนฮฟฮธฮฎฮบฮท ฮดฮตฮฝ ฯ€ฮตฯฮนฮญฯ‡ฮตฮน ฯ€ฮตฮดฮฏฮฟ ฮตฮปฮญฮณฯ‡ฮฟฯ
 msgid "Unable to get a cursor"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฯ€ฯฯŒฯƒฮฒฮฑฯƒฮท ฯƒฮต ฮดฮตฮฏฮบฯ„ฮท"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฯ„ฮฟฯ… ฮบฮฑฯ„ฮฑฮปฯŒฮณฮฟฯ…  %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮทฯ‚ ฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚ ฯ„ฮฟฯ… %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: ฮฃฯ†ฮฌฮปฮผฮฑฯ„ฮฑ ฯƒฯ„ฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฮฝฮตฯฯฮตฯƒฮทฯ‚"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฮฝฮฟฮฏฮณฮผฮฑฯ„ฮฟฯ‚ ฯ„ฮฟฯ… %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "ฮ‘ฯ€ฮฟฯƒฯฮฝฮดฮตฯƒฮท %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮทฯ‚ ฯ„ฮฟฯ… %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฯ€ฮฟฯƒฯฮฝฮดฮตฯƒฮทฯ‚ ฯ„ฮฟฯ… %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "    ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฯƒฯฮฝฮดฮตฯƒฮทฯ‚ ฯ„ฮฟฯ… %s ฮผฮต ฯ„ฮฟ %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ฮ‘ฯ€ฮฟฯƒฯฮฝฮดฮตฯƒฮท ฮฟฯฮฏฮฟฯ… ฯ„ฮฟฯ… %sB hit.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ฮ— ฮฑฯฯ‡ฮตฮนฮฟฮธฮฎฮบฮท ฮดฮตฮฝ ฯ€ฮตฯฮนฮญฯ‡ฮตฮน ฯ€ฮตฮดฮฏฮฟ ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ฮดฮตฮฝ ฯ€ฮตฯฮนฮญฯ‡ฮตฮน ฮตฮณฮณฯฮฑฯ†ฮฎ ฯ€ฮฑฯฮฌฮบฮฑฮผฯˆฮทฯ‚\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ฯƒฯ…ฮฝฯ„ฮทฯฮทฯ„ฮฎฯ‚ ฮตฮฏฮฝฮฑฮน ฮฟ %s ฯŒฯ‡ฮน ฮฟ %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ฮดฮตฮฝ ฮญฯ‡ฮตฮน ฮตฮณฮณฯฮฑฯ†ฮฎ ฯ€ฮทฮณฮฑฮฏฮฑฯ‚ ฯ€ฮฑฯฮฌฮบฮฑฮผฯˆฮทฯ‚\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ฮดฮตฮฝ ฮญฯ‡ฮตฮน ฮฟฯฯ„ฮต ฮตฮณฮณฯฮฑฯ†ฮฎ ฮดฯ…ฮฑฮดฮนฮบฮฎฯ‚ ฯ€ฮฑฯฮฌฮบฮฑฮผฯˆฮทฯ‚\n"
@@ -2042,7 +2069,7 @@ msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮทฯ‚ ฮบฮฑฯ„ฮฌ ฯ„ฮฟฮฝ ฯ…ฯ€ฮฟฮปฮฟฮณฮนฯƒฮผฯŒ
 msgid "Problem unlinking %s"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮฑฯ€ฮฟฯƒฯฮฝฮดฮตฯƒฮท ฯ„ฮฟฯ… %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮผฮตฯ„ฮฟฮฝฮฟฮผฮฑฯƒฮฏฮฑฯ‚ ฯ„ฮฟฯ… %s ฯƒฮต %s"
@@ -2101,23 +2128,23 @@ msgstr ""
 "  -c=? ฮ‘ฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฮฑฯ…ฯ„ฮฟฯ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯฯ…ฮธฮผฮฏฯƒฮตฯ‰ฮฝ\n"
 "  -o=? ฮ˜ฮญฯƒฮต ฮผฮนฮฑ ฮฑฯ…ฮธฮฑฮฏฯฮตฯ„ฮท ฯ€ฮฑฯฮฌฮผฮตฯ„ฯฮฟ,ฯ€ฯ‡ -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮท ฮดฮทฮผฮนฮฟฯ…ฯฮณฮฏฮฑ ฮดฮนฮฑฯƒฯ‰ฮปฮทฮฝฯŽฯƒฮตฯ‰ฮฝ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฮบฯ„ฮญฮปฮตฯƒฮท ฯ„ฮฟฯ… gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ฮšฮฑฯ„ฮตฯƒฯ„ฯฮฑฮผฮผฮญฮฝฮท ฮฑฯฯ‡ฮตฮนฮฟฮธฮฎฮบฮท"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ฮคฮฟ Checksum ฯ„ฮฟฯ… tar ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต, ฮท ฮฑฯฯ‡ฮตฮฏฮฟฮธฮฎฮบฮท ฮตฮฏฮฝฮฑฮน ฮบฮฑฯ„ฮตฯƒฯ„ฯฮฑฮผฮผฮญฮฝฮท"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ฮ†ฮณฮฝฯ‰ฯƒฯ„ฮท ฮตฯ€ฮนฮบฮตฯ†ฮฑฮปฮฏฮดฮฑ TAR ฯ„ฯฯ€ฮฟฯ‚ %u, ฮผฮญฮปฮฟฯ‚ %s"
@@ -2188,54 +2215,54 @@ msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮตฮณฮณฯฮฑฯ†ฮฎฯ‚ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
 msgid "Failed to close file %s"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฯƒฯ„ฮฟ ฮบฮปฮตฮฏฯƒฮนฮผฮฟ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ฮ— ฮดฮนฮฑฮดฯฮฟฮผฮฎ %s ฮญฯ‡ฮตฮน ฯ…ฯ€ฮตฯฮฒฮฟฮปฮนฮบฯŒ ฮผฮฎฮบฮฟฯ‚"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "ฮ‘ฯ€ฮฟฯƒฯ…ฮผฯ€ฮฏฮตฯƒฮท ฯ„ฮฟฯ… %s ฯ€ฮฌฮฝฯ‰ ฮฑฯ€ฯŒ ฮผฮนฮฑ ฯ†ฮฟฯฮฌ"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ฮŸ ฯ†ฮฌฮบฮตฮปฮฟฯ‚ %s ฮญฯ‡ฮตฮน ฮตฮบฯ„ฯฮฑฯ€ฮตฮฏ"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ฮคฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ ฯ€ฯฮฟฯƒฯ€ฮฑฮธฮตฮฏ ฮฝฮฑ ฮณฯฮฌฯˆฮตฮน ฯƒฯ„ฮฟฮฝ ฯ€ฯฮฟฮฟฯฮนฯƒฮผฯŒ ฮตฮบฯ„ฯฮฟฯ€ฮฎฯ‚ %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "ฮ— ฮดฮนฮฑฮดฯฮฟฮผฮฎ ฮตฮบฯ„ฯฮฟฯ€ฮฎฯ‚ ฮญฯ‡ฮตฮน ฯ…ฯ€ฮตฯฮฒฮฟฮปฮนฮบฯŒ ฮผฮฎฮบฮฟฯ‚"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ฮŸ ฯ†ฮฌฮบฮตฮปฮฟฯ‚ %s ฮฑฮฝฯ„ฮนฮบฮฑฮธฮฏฯƒฯ„ฮฑฯ„ฮฑฮน ฮฑฯ€ฯŒ ฮญฮฝฮฑ ฮผฮท-ฯ†ฮฌฮบฮตฮปฮฟ"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮตฮฝฯ„ฮฟฯ€ฮนฯƒฮผฮฟฯ ฯ„ฮฟฯ… ฮบฯŒฮผฮฒฮฟฯ… ฯƒฯ„ฮทฮฝ ฮฟฮผฮฌฮดฮฑ hash ฯ„ฮฟฯ…"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ฮ— ฮดฮนฮฑฮดฯฮฟฮผฮฎ ฮญฯ‡ฮตฮน ฯ…ฯ€ฮตฯฮฒฮฟฮปฮนฮบฯŒ ฮผฮฎฮบฮฟฯ‚"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "ฮ‘ฮฝฯ„ฮนฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮท ฯ€ฮฑฮบฮญฯ„ฮฟฯ… ฯ‡ฯ‰ฯฮฏฯ‚ ฮบฮฑฮผฮฏฮฑ ฮญฮบฮดฮฟฯƒฮท %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ฮคฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ %s/%s ฮฑฮฝฯ„ฮนฮบฮฑฮธฮนฯƒฯ„ฮฌ ฮฑฯ…ฯ„ฯŒ ฯƒฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮทฯ‚ ฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚ ฯ„ฮฟฯ… %s"
@@ -2315,30 +2342,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "ฮ— ฮตฯ€ฮนฮปฮฟฮณฮฎ %s ฮดฮต ฮฒฯฮญฮธฮทฮบฮต"
@@ -2410,6 +2437,16 @@ msgstr "%c%s... ฮฃฯ†ฮฌฮปฮผฮฑ!"
 msgid "%c%s... Done"
 msgstr "%c%s... ฮŸฮปฮฟฮบฮปฮทฯฯŽฮธฮทฮบฮต"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ฮŸฮปฮฟฮบฮปฮทฯฯŽฮธฮทฮบฮต"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2471,117 +2508,123 @@ msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮทฯ‚ ฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚ ฯ„ฮฟฯ… cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮฟ ฮบฮปฮตฮฏฯƒฮนฮผฮฟ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "ฮ”ฮต ฮธฮฑ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮทฮธฮตฮฏ ฮบฮปฮตฮฏฮดฯ‰ฮผฮฑ ฮณฮนฮฑ ฯ„ฮฟ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮทฯ‚ ฮผฯŒฮฝฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ ฮบฮปฮตฮนฮดฯŽฮผฮฑฯ„ฮฟฯ‚ %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฮบฮปฮตฮนฮดฯŽฮผฮฑฯ„ฮฟฯ‚ %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ฮ”ฮต ฮธฮฑ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮทฮธฮตฮฏ ฮบฮปฮตฮฏฮดฯ‰ฮผฮฑ ฮณฮนฮฑ ฯ„ฮฟ ฯƒฯ…ฮฝฮฑฯฮผฮฟฯƒฮผฮญฮฝฮฟ ฮฑฯ€ฯŒ nfs ฮฑฯฯ‡ฮตฮฏฮฟ ฮบฮปฮตฮนฮดฯŽฮผฮฑฯ„ฮฟฯ‚ "
 "%s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮบฮปฮตฮฏฮดฯ‰ฮผฮฑ %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ฮ— ฯ…ฯ€ฮฟฮดฮนฮตฯฮณฮฑฯƒฮฏฮฑ %s ฮญฮปฮฑฮฒฮต ฮญฮฝฮฑ ฯƒฯ†ฮฌฮปฮผฮฑ ฮบฮฑฯ„ฮฑฮผฮตฯฮนฯƒฮผฮฟฯ (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ฮ— ฯ…ฯ€ฮฟฮดฮนฮตฯฮณฮฑฯƒฮฏฮฑ %s ฮญฮปฮฑฮฒฮต ฮญฮฝฮฑ ฯƒฯ†ฮฌฮปฮผฮฑ ฮบฮฑฯ„ฮฑฮผฮตฯฮนฯƒฮผฮฟฯ (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ฮ— ฯ…ฯ€ฮฟฮดฮนฮตฯฮณฮฑฯƒฮฏฮฑ %s ฮตฯ€ฮญฯƒฯ„ฯฮตฯˆฮต ฮญฮฝฮฑ ฮบฯ‰ฮดฮนฮบฯŒฯ‚ ฯƒฯ†ฮฌฮปฮผฮฑฯ„ฮฟฯ‚ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ฮ— ฯ…ฯ€ฮฟฮดฮนฮตฯฮณฮฑฯƒฮฏฮฑ %s ฮตฮณฮบฮฑฯ„ฮญฮปฮตฮนฯˆฮต ฮฑฯ€ฯฯŒฯƒฮผฮตฮฝฮฑ"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฮดฮนฮฑฯƒฯ‰ฮปฮฎฮฝฯ‰ฯƒฮทฯ‚ ฮณฮนฮฑ ฯ„ฮฟ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮดฮทฮผฮนฮฟฯ…ฯฮณฮฏฮฑฯ‚ IPC ฯƒฯ„ฮทฮฝ ฯ…ฯ€ฮฟฮดฮนฮตฯฮณฮฑฯƒฮฏฮฑ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "ฮ‘ฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑ ฮตฮบฯ„ฮญฮปฮตฯƒฮทฯ‚ ฯ„ฮฟฯ… ฯƒฯ…ฮผฯ€ฮนฮตฯƒฯ„ฮฎ "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "ฮฑฮฝฮฑฮณฮฝฯŽฯƒฯ„ฮทฮบฮฑฮฝ, ฮฑฯ€ฮฟฮผฮญฮฝฮฟฯ…ฮฝ ฮฑฮบฯŒฮผฮท %lu ฮณฮนฮฑ ฮฑฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฮฑฮปฮปฮฌ ฮดฮตฮฝ ฮฑฯ€ฮฟฮผฮญฮฝฮฟฯ…ฮฝ ฮฌฮปฮปฮฑ"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ฮณฯฮฌฯ†ฯ„ฮทฮบฮฑฮฝ, ฮฑฯ€ฮฟฮผฮญฮฝฮฟฯ…ฮฝ %lu ฮณฮนฮฑ ฮตฮณฮณฯฮฑฯ†ฮฎ ฮฑฮปฮปฮฌ ฯ‡ฯ‰ฯฮฏฯ‚ ฮตฯ€ฮนฯ„ฯ…ฯ‡ฮฏฮฑ"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮฟ ฮบฮปฮตฮฏฯƒฮนฮผฮฟ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮฟฮฝ ฯƒฯ…ฮณฯ‡ฯฮฟฮฝฮนฯƒฮผฯŒ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮดฮนฮฑฮณฯฮฑฯ†ฮฎ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ฮ ฯฯŒฮฒฮปฮทฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮฟฮฝ ฯƒฯ…ฮณฯ‡ฯฮฟฮฝฮนฯƒฮผฯŒ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "ฮ•ฮณฮบฮฑฯ„ฮฌฮปฮตฮนฯˆฮท ฯ„ฮทฯ‚ ฮตฮณฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ฮ†ฮดฮตฮนฮฟ cache ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ"
@@ -2608,59 +2651,59 @@ msgstr "ฮ‘ฯ…ฯ„ฯŒ ฯ„ฮฟ APT ฮดฮตฮฝ ฯ…ฯ€ฮฟฯƒฯ„ฮทฯฮฏฮถฮตฮน ฯ„ฮฟ ฮฃฯฯƒฯ„ฮทฮผฮฑ ฮ‘ฯ€
 msgid "The package cache was built for a different architecture"
 msgstr "ฮ— cache ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ ฮบฮฑฯ„ฮฑฯƒฮบฮตฯ…ฮฌฯƒฯ„ฮทฮบฮต ฮณฮนฮฑ ฮผฮนฮฑ ฮดฮนฮฑฯ†ฮฟฯฮตฯ„ฮนฮบฮฎ ฮฑฯฯ‡ฮนฯ„ฮตฮบฯ„ฮฟฮฝฮนฮบฮฎ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ฮ•ฮพฮฑฯฯ„ฮฌฯ„ฮฑฮน ฮฑฯ€ฯŒ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "ฮ ฯฮฟฮ•ฮพฮฑฯฯ„ฮฌฯ„ฮฑฮน ฮฑฯ€ฯŒ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ฮ ฯฮฟฯ„ฮตฮฏฮฝฮตฮน"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ฮฃฯ…ฯƒฯ„ฮฎฮฝฮตฮน"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "ฮ‘ฯƒฯฮผฮฒฮฑฯ„ฮฟ ฮผฮต"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ฮ‘ฮฝฯ„ฮนฮบฮฑฮธฮนฯƒฯ„ฮฌ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ฮ‘ฯ€ฮฑฯฯ‡ฮฑฮนฯŽฮฝฮตฮน"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ฮงฮฑฮปฮฌฮตฮน"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "ฯƒฮทฮผฮฑฮฝฯ„ฮนฮบฯŒ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ฮฑฯ€ฮฑฮนฯ„ฮฟฯฮผฮตฮฝฮฟ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ฮบฮฑฮธฮนฮตฯฯ‰ฮผฮญฮฝฮฟ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ฯ€ฯฮฟฮฑฮนฯฮตฯ„ฮนฮบฯŒ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ฮตฯ€ฮนฯ€ฮปฮญฮฟฮฝ"
 
@@ -2760,29 +2803,29 @@ msgstr "ฮ†ฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… %s"
 msgid "Line %u too long in source list %s."
 msgstr "ฮ— ฮณฯฮฑฮผฮผฮฎ %u ฮญฯ‡ฮตฮน ฯ…ฯ€ฮตฯฮฒฮฟฮปฮนฮบฯŒ ฮผฮฎฮบฮฟฯ‚ ฯƒฯ„ฮท ฮปฮฏฯƒฯ„ฮฑ ฯ€ฮทฮณฯŽฮฝ %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ฮ›ฮฌฮธฮฟฯ‚ ฮผฮฟฯฯ†ฮฎ ฯ„ฮทฯ‚ ฮณฯฮฑฮผฮผฮฎฯ‚ %u ฯƒฯ„ฮท ฮปฮฏฯƒฯ„ฮฑ ฯ€ฮทฮณฯŽฮฝ %s (ฯ„ฯฯ€ฮฟฯ‚)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ฮŸ ฯ„ฯฯ€ฮฟฯ‚ '%s' ฯƒฯ„ฮท ฮณฯฮฑฮผฮผฮฎ %u ฯƒฯ„ฮท ฮปฮฏฯƒฯ„ฮฑ ฯ€ฮทฮณฯŽฮฝ %s ฮตฮฏฮฝฮฑฮน ฮฌฮณฮฝฯ‰ฯƒฯ„ฮฟฯ‚ "
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2807,7 +2850,7 @@ msgstr ""
 "ฮคฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ '%s' ฯ‡ฯฮตฮนฮฌฮถฮตฯ„ฮฑฮน ฮฝฮฑ ฮตฯ€ฮฑฮฝฮตฮณฮบฮฑฯ„ฮฑฯƒฯ„ฮฑฮธฮตฮฏ, ฮฑฮปฮปฮฌ ฮตฮฏฮฝฮฑฮน ฮฑฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท "
 "ฮบฮฌฯ€ฮฟฮนฮฑฯ‚ ฮบฮฑฯ„ฮฌฮปฮปฮทฮปฮทฯ‚ ฮฑฯฯ‡ฮตฮฏฮฟฮธฮฎฮบฮทฯ‚."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2815,11 +2858,11 @@ msgstr ""
 "ฮฃฯ†ฮฌฮปฮผฮฑ, ฯ„ฮฟ pkgProblemResolver::Resolve ฯ€ฮฑฯฮฎฮณฮฑฮณฮต ฮดฮนฮฑฮบฮฟฯ€ฮญฯ‚, ฮฑฯ…ฯ„ฯŒ ฮฏฯƒฯ‰ฯ‚ "
 "ฯ€ฯฮฟฮบฮปฮฎฮธฮทฮบฮต ฮฑฯ€ฯŒ ฮบฯฮฑฯ„ฮฟฯฮผฮตฮฝฮฑ ฯ€ฮฑฮบฮญฯ„ฮฑ."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮดฮนฯŒฯฮธฯ‰ฯƒฮท ฯ€ฯฮฟฮฒฮปฮทฮผฮฌฯ„ฯ‰ฮฝ, ฮญฯ‡ฮตฯ„ฮต ฮบฯฮฑฯ„ฮฟฯฮผฮตฮฝฮฑ ฮตฮปฮฑฯ„ฯ„ฯ‰ฮผฮฑฯ„ฮนฮบฮฌ ฯ€ฮฑฮบฮญฯ„ฮฑ."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2828,7 +2871,7 @@ msgstr ""
 "ฮœฮตฯฮนฮบฮฌ ฮฑฯฯ‡ฮตฮฏฮฑ ฮดฮตฮฝ ฮผฮตฯ„ฮฑฯ†ฮฟฯฯ„ฯŽฮธฮทฮบฮฑฮฝ, ฮฑฮณฮฝฮฟฮฎฮธฮทฮบฮฑฮฝ ฮฎ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮฎฮธฮทฮบฮฑฮฝ ฯ€ฮฑฮปฮฑฮนฯŒฯ„ฮตฯฮฑ "
 "ฯƒฯ„ฮท ฮธฮญฯƒฮท ฯ„ฮฟฯ…ฯ‚."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "ฮŸ ฯ†ฮฌฮบฮตฮปฮฟฯ‚ ฮปฮนฯƒฯ„ฯŽฮฝ %spartial ฮฑฮณฮฝฮฟฮตฮฏฯ„ฮฑฮน."
@@ -2865,19 +2908,19 @@ msgstr "ฮŸ ฮฟฮดฮทฮณฯŒฯ‚ ฮผฮตฮธฯŒฮดฮฟฯ… %s ฮดฮตฮฝ ฮผฯ€ฮฟฯฮตฮฏ ฮฝฮฑ ฮตฮฝฯ„ฮฟฯ€ฮนฯ
 msgid "Method %s did not start correctly"
 msgstr "ฮ— ฮผฮญฮธฮฟฮดฮฟฯ‚ %s ฮดฮตฮฝ ฮตฮบฮบฮนฮฝฮฎฮธฮทฮบฮต ฯƒฯ‰ฯƒฯ„ฮฌ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "ฮ ฮฑฯฮฑฮบฮฑฮปฯŽ ฮตฮนฯƒฮฌฮณฮตฯ„ฮต ฯ„ฮฟ ฮดฮฏฯƒฮบฮฟ ฮผฮต ฮตฯ„ฮนฮบฮญฯ„ฮฑ '%s' ฯƒฯ„ฮท ฯƒฯ…ฯƒฮบฮตฯ…ฮฎ '%s' ฮบฮฑฮน ฯ€ฮฑฯ„ฮฎฯƒฯ„ฮต "
 "enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ฮคฮฟ ฯƒฯฯƒฯ„ฮทฮผฮฑ ฯƒฯ…ฯƒฮบฮตฯ…ฮฑฯƒฮฏฮฑฯ‚ '%s' ฮดฮตฮฝ ฯ…ฯ€ฮฟฯƒฯ„ฮทฯฮฏฮถฮตฯ„ฮฑฮน"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟฯ‚ ฮฟ ฮบฮฑฮธฮฟฯฮนฯƒฮผฯŒฯ‚ ฮตฮฝฯŒฯ‚ ฮบฮฑฯ„ฮฌฮปฮปฮทฮปฮฟฯ… ฯ„ฯฯ€ฮฟฯ… ฯƒฯ…ฯƒฯ„ฮฎฮผฮฑฯ„ฮฟฯ‚ ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ"
 
@@ -2933,14 +2976,14 @@ msgstr "ฮ— cache ฮญฯ‡ฮตฮน ฮฑฯƒฯฮผฮฒฮฑฯ„ฮฟ ฯƒฯฯƒฯ„ฮทฮผฮฑ ฮฑฯ€ฯŒฮดฮฟฯƒฮทฯ‚ ฮญฮบฮ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ฮ ฯฮฟฮญฮบฯ…ฯˆฮต ฯƒฯ†ฮฌฮปฮผฮฑ ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฯ€ฮตฮพฮตฯฮณฮฑฯƒฮฏฮฑ ฯ„ฮฟฯ… %s (FindPkg)"
@@ -2965,26 +3008,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "ฮ•ฮบฯ€ฮปฮทฮบฯ„ฮนฮบฯŒ, ฯ…ฯ€ฮตฯฮฒฮฎฮบฮฑฯ„ฮต ฯ„ฮฟฮฝ ฮฑฯฮนฮธฮผฯŒ ฯ„ฯ‰ฮฝ ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฯ‰ฮฝ ฯ€ฮฟฯ… ฯ…ฯ€ฮฟฯƒฯ„ฮทฯฮฏฮถฮตฮน ฯ„ฮฟ APT."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ฮคฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s %s ฮดฮต ฮฒฯฮญฮธฮทฮบฮต ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฯ€ฮตฮพฮตฯฮณฮฑฯƒฮฏฮฑ ฮตฮพฮฑฯฯ„ฮฎฯƒฮตฯ‰ฮฝ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮตฯฯฮตฯƒฮท ฯ„ฮทฯ‚ ฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚ ฯ„ฮทฯ‚ ฮปฮฏฯƒฯ„ฮฑฯ‚ ฯ€ฮทฮณฮฑฮฏฯ‰ฮฝ ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ฮ‘ฮฝฮฌฮณฮฝฯ‰ฯƒฮท ฮ›ฮนฯƒฯ„ฯŽฮฝ ฮ ฮฑฮบฮญฯ„ฯ‰ฮฝ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ฮฃฯ…ฮปฮปฮฟฮณฮฎ ฮ ฮฑฯฮฟฯ‡ฯŽฮฝ ฮ‘ฯฯ‡ฮตฮฏฮฟฯ…"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ฮฃฯ†ฮฌฮปฮผฮฑ IO ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮฑฯ€ฮฟฮธฮฎฮบฮตฯ…ฯƒฮท ฯ„ฮทฯ‚ cache ฯ€ฮทฮณฯŽฮฝ"
 
@@ -2997,53 +3040,53 @@ msgstr "ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต ฮท ฮผฮตฯ„ฮฟฮฝฮฟฮผฮฑฯƒฮฏฮฑ, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "ฮ‘ฮฝฯŒฮผฮฟฮนฮฟ MD5Sum"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "ฮ‘ฮฝฯŒฮผฮฟฮนฮฟ MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฮฝฮฌฮปฯ…ฯƒฮท ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ฮ”ฮตฮฝ ฯ…ฯ€ฮฌฯฯ‡ฮตฮน ฮดฮนฮฑฮธฮญฯƒฮนฮผฮฟ ฮดฮทฮผฯŒฯƒฮนฮฟ ฮบฮปฮตฮนฮดฮฏ ฮณฮนฮฑ ฯ„ฮฑ ฮฑฮบฮฟฮปฮฟฯ…ฮธฮฑ ฮบฮปฮตฮนฮดฮนฮฌ:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,7 +3095,7 @@ msgstr ""
 "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟฯ‚ ฮฟ ฮตฮฝฯ„ฮฟฯ€ฮนฯƒฮผฯŒฯ‚ ฮตฮฝฯŒฯ‚ ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฮณฮนฮฑ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s. ฮ‘ฯ…ฯ„ฯŒ ฮฏฯƒฯ‰ฯ‚ ฯƒฮทฮผฮฑฮฏฮฝฮตฮน ฯŒฯ„ฮน "
 "ฯ‡ฯฮตฮนฮฌฮถฮตฯ„ฮฑฮน ฮฝฮฑ ฮดฮนฮฟฯฮธฯŽฯƒฮตฯ„ฮต ฯ‡ฮตฮนฯฮฟฮบฮฏฮฝฮทฯ„ฮฑ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ. (ฮปฯŒฮณฯ‰ ฯ‡ฮฑฮผฮญฮฝฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ…)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3104,7 @@ msgstr ""
 "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟฯ‚ ฮฟ ฮตฮฝฯ„ฮฟฯ€ฮนฯƒฮผฯŒฯ‚ ฮตฮฝฯŒฯ‚ ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฮณฮนฮฑ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ %s. ฮ‘ฯ…ฯ„ฯŒ ฮฏฯƒฯ‰ฯ‚ ฯƒฮทฮผฮฑฮฏฮฝฮตฮน ฯŒฯ„ฮน "
 "ฯ‡ฯฮตฮนฮฌฮถฮตฯ„ฮฑฮน ฮฝฮฑ ฮดฮนฮฟฯฮธฯŽฯƒฮตฯ„ฮต ฯ‡ฮตฮนฯฮฟฮบฮฏฮฝฮทฯ„ฮฑ ฯ„ฮฟ ฯ€ฮฑฮบฮญฯ„ฮฟ."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3069,31 +3112,31 @@ msgstr ""
 "ฮšฮฑฯ„ฮตฯƒฯ„ฯฮฑฮผฮผฮญฮฝฮฑ ฮฑฯฯ‡ฮตฮฏฮฑ ฮตฯ…ฯฮตฯ„ฮทฯฮฏฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ. ฮ”ฮตฮฝ ฯ…ฯ€ฮฌฯฯ‡ฮตฮน ฯ€ฮตฮดฮฏฮฟ Filename: ฯƒฯ„ฮฟ "
 "ฯ€ฮฑฮบฮญฯ„ฮฟ %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ฮ‘ฮฝฯŒฮผฮฟฮนฮฟ ฮผฮญฮณฮตฮธฮฟฯ‚"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฮฝฮฌฮปฯ…ฯƒฮท ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "ฮฃฮทฮผฮตฮฏฯ‰ฯƒฮท, ฮตฯ€ฮนฮปฮญฯ‡ฮธฮทฮบฮต ฯ„ฮฟ %s ฮฑฮฝฯ„ฮฏ ฯ„ฮฟฯ…%s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ฮœฮท ฮญฮณฮบฯ…ฯฮท ฮณฯฮฑฮผฮผฮฎ ฯƒฯ„ฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ ฯ€ฮฑฯฮฑฮบฮฌฮผฯˆฮตฯ‰ฮฝ: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮท ฮท ฮฑฮฝฮฌฮปฯ…ฯƒฮท ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯ€ฮฑฮบฮญฯ„ฮฟฯ… %s (1)"
@@ -3121,7 +3164,7 @@ msgstr "ฮ‘ฮฝฮฑฮณฮฝฯŽฯฮนฯƒฮท..."
 msgid "Stored label: %s\n"
 msgstr "ฮ‘ฯ€ฮฟฮธฮฎฮบฮตฯ…ฯƒฮท ฮ•ฯ„ฮนฮบฮญฯ„ฮฑฯ‚: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ฮ‘ฯ€ฮฟฯ€ฯฮฟฯƒฮฌฯฯ„ฮทฯƒฮท ฯ„ฮฟฯ… CD-ROM...\n"
 
@@ -3183,30 +3226,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ฮ‘ฮฝฯ„ฮนฮณฯฮฑฯ†ฮฎ ฮปฮนฯƒฯ„ฯŽฮฝ ฯ€ฮฑฮบฮญฯ„ฯ‰ฮฝ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Eฮณฮณฯฮฑฯ†ฮฎ ฮฝฮญฮฑฯ‚ ฮปฮฏฯƒฯ„ฮฑฯ‚ ฯ€ฮทฮณฯŽฮฝ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ฮŸฮน ฮบฮฑฯ„ฮฌฮปฮฟฮณฮฟฮน ฮผฮต ฯ„ฮนฯ‚ ฯ€ฮทฮณฮญฯ‚ ฮฑฯ…ฯ„ฮฟฯ ฯ„ฮฟฯ… ฮดฮฏฯƒฮบฮฟฯ… ฮตฮฏฮฝฮฑฮน: \n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "ฮ•ฮณฮนฮฝฮฑฮฝ %i ฮตฮณฮณฯฮฑฯ†ฮญฯ‚.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "ฮ•ฮณฮนฮฝฮฑฮฝ %i ฮตฮณฮณฯฮฑฯ†ฮญฯ‚ ฮผฮต %i ฮฑฯ€ฯŽฮฝฯ„ฮฑ ฮฑฯฯ‡ฮตฮฏฮฑ.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "ฮ•ฮณฮนฮฝฮฑฮฝ %i ฮตฮณฮณฯฮฑฯ†ฮญฯ‚ ฮผฮต %i ฮฑฯƒฯฮผฮฒฮฑฯ„ฮฑ ฮฑฯฯ‡ฮตฮฏฮฑ.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "ฮ•ฮณฮนฮฝฮฑฮฝ %i ฮตฮณฮณฯฮฑฯ†ฮญฯ‚ ฮผฮต %i ฮฑฯ€ฯŽฮฝฯ„ฮฑ ฮฑฯฯ‡ฮตฮฏฮฑ ฮบฮฑฮน %i ฮฑฯƒฯฮผฮฒฮฑฯ„ฮฑ ฮฑฯฯ‡ฮตฮฏฮฑ\n"
@@ -3221,17 +3264,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "ฮ‘ฮฝฯŒฮผฮฟฮนฮฟ MD5Sum"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "ฮ•ฮณฮบฮฑฯ„ฮฌฮปฮตฮนฯˆฮท ฯ„ฮทฯ‚ ฮตฮณฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮทฯ‚."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3295,121 +3327,121 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ฮ•ฮณฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮท ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ฮกฯฮธฮผฮนฯƒฮท ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ฮ‘ฯ†ฮฑฮนฯฯŽ ฯ„ฮฟ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "ฮคฮฟ %s ฮดฮนฮฑฮณฯฮฌฯ†ฮทฮบฮต ฯ€ฮปฮฎฯฯ‰ฯ‚"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ฮ•ฮบฯ„ฮญฮปฮตฯƒฮท ฯ„ฮฟฯ… post-installation trigger %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ฮŸ ฯ†ฮฌฮบฮตฮปฮฟฯ‚ %s ฮฑฮณฮฝฮฟฮตฮฏฯ„ฮฑฮน."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "ฮ‘ฮดฯฮฝฮฑฯ„ฮฟ ฯ„ฮฟ ฮฌฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ฮ ฯฮฟฮตฯ„ฮฟฮนฮผฮฑฯƒฮฏฮฑ ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ฮžฮตฯ€ฮฑฮบฮตฯ„ฮฌฯฮนฯƒฮผฮฑ ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ฮ ฯฮฟฮตฯ„ฮฟฮนฮผฮฑฯƒฮฏฮฑ ฯฯฮธฮผฮนฯƒฮทฯ‚ ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ฮˆฮณฮนฮฝฮต ฮตฮณฮบฮฑฯ„ฮฌฯƒฯ„ฮฑฯƒฮท ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ฮ ฯฮฟฮตฯ„ฮฟฮนฮผฮฑฯƒฮฏฮฑ ฮณฮนฮฑ ฯ„ฮทฮฝ ฮฑฯ†ฮฑฮฏฯฮตฯƒฮท ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ฮ‘ฯ†ฮฑฮฏฯฮตฯƒฮฑ ฯ„ฮฟ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ฮ ฯฮฟฮตฯ„ฮฟฮนฮผฮฑฯƒฮฏฮฑ ฯ€ฮปฮฎฯฮทฯ‚ ฮฑฯ†ฮฑฮฏฯฮตฯƒฮทฯ‚ ฯ„ฮฟฯ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "ฮคฮฟ %s ฮดฮนฮฑฮณฯฮฌฯ†ฮทฮบฮต ฯ€ฮปฮฎฯฯ‰ฯ‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ฮ‘ฮดฯ…ฮฝฮฑฮผฮฏฮฑ ฮตฮณฮณฯฮฑฯ†ฮฎฯ‚ ฯƒฯ„ฮฟ ฮฑฯฯ‡ฮตฮฏฮฟ ฮณฮตฮณฮฟฮฝฯŒฯ„ฯ‰ฮฝ, ฮปฯŒฮณฯ‰ ฮฑฯ€ฮฟฯ„ฯ…ฯ‡ฮฏฮฑฯ‚ ฯ„ฮฟฯ… openpyt() (ฮตฮฏฮฝฮฑฮน "
 "ฯ€ฯฮฟฯƒฮฑฯฯ„ฮทฮผฮญฮฝฮฟ ฯ„ฮฟ /dev/pts;)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3421,13 +3453,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3457,14 +3483,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "ฮšฮฌฯ„ฮน ฯ€ฮฑฯฮฌฮพฮตฮฝฮฟ ฯƒฯ…ฮฝฮญฮฒฮท ฮบฮฑฯ„ฮฌ ฯ„ฮทฮฝ ฮตฯฯฮตฯƒฮท ฯ„ฮฟฯ… '%s:%s' (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ฮŸฮปฮฟฮบฮปฮทฯฯŽฮธฮทฮบฮต"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ฮ†ฮฝฮฟฮนฮณฮผฮฑ ฯ„ฮฟฯ… ฮฑฯฯ‡ฮตฮฏฮฟฯ… ฯฯ…ฮธฮผฮฏฯƒฮตฯ‰ฮฝ %s"
 
diff --git a/po/es.po b/po/es.po
index 2079bc67f..dea136d4d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2011-01-24 11:47+0100\n"
 "Last-Translator: Javier Fernรกndez-Sanguino Peรฑa <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -151,73 +151,73 @@ msgstr "Espacio registrado total: "
 msgid "Package file %s is out of sync."
 msgstr "El archivo de paquetes %s estรก desincronizado."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "No se encontrรณ ningรบn paquete"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Debe proporcionar al menos un patrรณn de bรบsqueda"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Esta orden estรก obsoleta. Use ยซapt-mark showautoยป en su lugar."
+msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No se ha podido localizar el paquete %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Cachรฉ fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(no encontrado)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabla de versiรณn:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -295,21 +295,29 @@ msgstr ""
 "       p.ej. -o dir::cache=/tmp\n"
 "Vea las pรกginas del manual apt-cache(8) y apt.conf(5) para mรกs informaciรณn.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Proporcione un nombre para este disco, como pueda ser ยซDebian 5.0.3 Disco 1ยป"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor, introduzca un disco en la unidad y pulse Intro"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "No se pudo montar ยซ%sยป como ยซ%sยป"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este proceso para el resto de los CDs del conjunto."
 
@@ -352,7 +360,7 @@ msgstr "S"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -545,7 +553,7 @@ msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s ya estรก en su versiรณn mรกs reciente.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
@@ -657,8 +665,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Se liberarรกn %sB despuรฉs de esta operaciรณn.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
@@ -697,7 +705,7 @@ msgstr "Abortado."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ยฟDesea continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
@@ -706,7 +714,7 @@ msgstr "Imposible obtener %s  %s\n"
 msgid "Some files failed to download"
 msgstr "No se pudieron descargar algunos archivos"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sรณlo descarga"
 
@@ -791,7 +799,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente informaciรณn puede ayudar a resolver la situaciรณn:"
 
@@ -844,7 +852,7 @@ msgstr ""
 "Dependencias incumplidas. Intente ยซapt-get -f installยป sin paquetes (o "
 "especifique una soluciรณn)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -856,80 +864,79 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarรกn los siguientes paquetes extras:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "fijado %s como instalado automรกticamente.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Esta orden es obsoleta. Use ยซapt-mark autoยป y ยซapt-mark manualยป en su lugar."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualizaciรณn... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fallรณ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Listo"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de soluciรณn de problemas rompiรณ algunas cosas"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "No se puede encontrar el origen para descargar la versiรณn ยซ%sยป de ยซ%sยป"
+msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Descargando %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Debe especificar al menos un paquete para obtener su cรณdigo fuente"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -939,7 +946,7 @@ msgstr ""
 "versiones ยซ%sยป en:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -951,89 +958,87 @@ msgstr ""
 "para obtener las รบltimas actualizaciones (posiblemente no publicadas aรบn) "
 "del paquete.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omitiendo el fichero ya descargado ยซ%sยป\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallรณ la orden de desempaquetamiento ยซ%sยป.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Compruebe que el paquete ยซdpkg-devยป estรฉ instalado.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallรณ la orden de construcciรณn ยซ%sยป.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Fallรณ el proceso hijo"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus dependencias de "
 "construcciรณn"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"No hay informaciรณn de la arquitectura disponible para %s. Vea apt.conf(5) "
-"APT::Architectures para configurar"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "No se pudo obtener informaciรณn de dependencias de construcciรณn para %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcciรณn.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1042,7 +1047,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1051,14 +1056,14 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
 "demasiado nuevo"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1067,7 +1072,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque ninguna versiรณn "
 "disponible del paquete %s satisface los requisitos de versiรณn"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1076,30 +1081,30 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No se pudieron satisfacer las dependencias de construcciรณn de %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcciรณn"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรณdulos soportados:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1190,7 +1195,7 @@ msgstr ""
 "para mรกs informaciรณn y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1265,7 +1270,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ya estรก en su versiรณn mรกs reciente.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba allรญ"
@@ -1282,7 +1288,7 @@ msgstr "No se pudo abrir %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Fallo al ejecutar dpkg. ยฟUsted es root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1305,26 +1311,6 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
-"Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
-"\n"
-"apt-mark es una interfaz de linea de รณrdenes para marcar paquetes\n"
-"para instalaciรณn manual o automรกtica. Tambiรฉn puede marcar listas.\n"
-"\n"
-"ร“rdenes:\n"
-"   auto - Marca los paquetes para instalaciรณn automรกtica\n"
-"   manual - Marca los paquetes para instalaciรณn manual\n"
-"\n"
-"Opciones:\n"
-"  -h  Este texto de ayuda.\n"
-"  -q  Salida del registro - sin indicador de progreso\n"
-"  -qq Sin salida excepto para errores\n"
-"  -s  No-act. Solo imprime lo que se harรญa.\n"
-"  -f   Marca lectura/escritura auto/manual en el archivo dado\n"
-"  -c=? Lee este archivo de configuraciรณn\n"
-"  -o=? Establece un opciรณn de configuraciรณn arbitraria, por ejemplo -o dir::"
-"cache=/tmp\n"
-"Vea las pรกginas del manual de apt-mark(8) y apt.conf(5) para tener mรกs "
-"informaciรณn."
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -1423,8 +1409,8 @@ msgstr "La conexiรณn expirรณ"
 msgid "Server closed the connection"
 msgstr "El servidor cerrรณ la conexiรณn"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Error de lectura"
 
@@ -1437,8 +1423,8 @@ msgid "Protocol corruption"
 msgstr "Fallo del protocolo"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Error de escritura"
 
@@ -1492,7 +1478,7 @@ msgstr "Expirรณ conexiรณn a socket de datos"
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexiรณn"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Se produjo un problema al hacer un hash del archivo"
 
@@ -1519,88 +1505,101 @@ msgstr "Consulta"
 msgid "Unable to invoke "
 msgstr "No pude invocar "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "No puedo iniciar la conexiรณn a %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "No pude conectarme a %s:%s (%s), expirรณ tiempo para conexiรณn"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No pude conectarme a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No se pudo resolver ยซ%sยป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal al resolver ยซ%sยป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Algo raro pasรณ al resolver ยซ%s:%sยป (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo raro pasรณ al resolver ยซ%s:%sยป (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "No se pudo conectar a %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error interno: Firma correcta, ยกยฟpero no se pudo determinar su huella "
 "digital?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontrรณ al menos una firma invรกlida."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No se pudo ejecutar ยซgpgvยป  para verificar la firma (ยฟestรก instalado gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron invรกlidas:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1610,7 +1609,7 @@ msgstr ""
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "Los archivos vacรญos no pueden ser archivadores vรกlidos"
+msgstr ""
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1640,53 +1639,53 @@ msgstr "ร‰ste servidor de http tiene el soporte de alcance roto"
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Fallรณ la selecciรณn"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Expirรณ la conexiรณn"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerrรณ la conexiรณn."
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Fallo la conexiรณn"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Error interno"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
@@ -1713,7 +1712,12 @@ msgstr "No se encontrรณ un archivo de rรฉplica ยซ%sยป"
 msgid "Can not read mirror file '%s'"
 msgstr "No se encontrรณ un archivo de rรฉplica ยซ%sยป"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "No se encontrรณ un archivo de rรฉplica ยซ%sยป"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Rรฉplica: %s]"
@@ -1814,7 +1818,7 @@ msgstr ""
 "  -o=? Establece una opciรณn de configuraciรณn arbitraria, p. ej. -o dir::"
 "cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No se puede escribir en %s"
@@ -1964,8 +1968,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "No se pudo abrir el archivo DB %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No pude leer %s"
@@ -1978,87 +1982,87 @@ msgstr "No hay registro de control del archivo"
 msgid "Unable to get a cursor"
 msgstr "No se pudo obtener un cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: No se pudo leer directorio %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: No se pudo leer %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Errores aplicables al archivo "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "No se pudo resolver %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Fallรณ el recorrido por el รกrbol."
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "No se pudo abrir %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "No se pudo leer el enlace %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "No se pudo desligar %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** No pude enlazar %s con %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink se ha llegado al lรญmite de %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archivo no tiene campo de paquetes"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s no tiene entrada de predominio\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " el encargado de %s es %s y no %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s no tiene una entrada fuente predominante\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -2132,7 +2136,7 @@ msgstr "No se pudo leer mientras se computaba MD5"
 msgid "Problem unlinking %s"
 msgstr "Se produjo un problema al desligar %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Fallรณ el renombre de %s a %s"
@@ -2192,24 +2196,24 @@ msgstr ""
 "  -o=? Establece una opciรณn de configuraciรณn arbitraria, p. ej. -o dir::\n"
 "cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "No pude crear las tuberรญas"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "No pude ejecutar gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Archivo daรฑado"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 "Se produjo un fallo al calcular la suma de control de tar, archive daรฑado"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
@@ -2280,54 +2284,54 @@ msgstr "Fallรณ la escritura del archivo %s"
 msgid "Failed to close file %s"
 msgstr "No pude cerrar el archivo %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "La trayectoria %s es demasiado larga"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s mรกs de una vez"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El directorio %s estรก desviado"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "El paquete estรก tratando de escribir al blanco desviado %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "La trayectoria de desviaciรณn es demasiado larga"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "El directorio %s estรก siendo reemplazado por un no-directorio"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "No pude localizar el nodo en su bote de enlace"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "La trayectoria es muy larga"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Sobreescribiendo concordancia del paquete sin versiรณn para %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "El archivo %s/%s sobreescribe al que estรก en el paquete %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No pude leer %s"
@@ -2409,30 +2413,30 @@ msgstr ""
 "deshabilitado el crecimiento automรกtico."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin. %liseg."
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin. %liseg."
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin. %liseg."
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%liseg."
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecciรณn %s no encontrada"
@@ -2506,6 +2510,16 @@ msgstr "%c%s... ยกError!"
 msgid "%c%s... Done"
 msgstr "%c%s... Hecho"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hecho"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2568,118 +2582,120 @@ msgstr "No pude montar el cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "Se produjo un problema al cerrar el fichero gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "No se utiliza bloqueos para el fichero de bloqueo de sรณlo lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No se pudo abrir el fichero de bloqueo ยซ%sยป"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No se pudo bloquear %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr "La lista de archivos no se puede crear como ยซ%sยป no es un directorio"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorando ยซ%sยป en directorio ยซ%sยป dado que no es un archivo regular"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
-"Ignorando el archivo ยซ%sยป en el directorio ยซ%sยป dado que no tiene extensiรณn "
-"del nombre"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
-"Ignorando archivo ยซ%sยป en directorio ยซ%sยป dado que tiene una extensiรณn de "
-"nombre de archivo invรกlida"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subproceso %s recibiรณ un fallo de segmentaciรณn."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subproceso %s recibiรณ la seรฑal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subproceso %s devolviรณ un cรณdigo de error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subproceso %s terminรณ de forma inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "No pude abrir el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "No se pudo abrir el descriptor de fichero %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "No se pudo crear el subproceso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "No se pudo ejecutar el compresor "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "leรญdos, todavรญa debรญa leer %lu pero no queda nada"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, todavรญa tenรญa que escribir %lu pero no pude hacerlo"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Se produjo un problema al cerrar el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Se produjo un problema al renombrar el fichero %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Se produjo un problema al desligar el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Se produjo un problema al sincronizar el fichero"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No se instalรณ ningรบn anillo de claves %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cachรฉ de paquetes vacรญa."
@@ -2706,59 +2722,59 @@ msgstr "Esta versiรณn de APT no soporta el sistema de versiones ยซ%sยป"
 msgid "The package cache was built for a different architecture"
 msgstr "La cachรฉ de paquetes se habรญa creado para una arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Entra en conflicto"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Reemplaza"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Hace obsoleto"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Mejora"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "requiere"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "estรกndar"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2864,17 +2880,17 @@ msgstr "Abriendo %s"
 msgid "Line %u too long in source list %s."
 msgstr "Lรญnea %u demasiado larga en la lista de fuentes %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Lรญnea %u mal formada en la lista de fuentes %s (tipo)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo ยซ%sยป desconocido en la lรญnea %u de lista de fuentes %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2884,12 +2900,12 @@ msgstr ""
 "de manual con ยซman 5 apt.confยป bajo ยซAPT::Immediate-Configureยป para mรกs "
 "informaciรณn. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "No pude abrir el fichero ยซ%sยป"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2914,7 +2930,7 @@ msgstr ""
 "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
 "รฉste."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2922,12 +2938,12 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve generรณ cortes, esto puede haber sido "
 "causado por paquetes retenidos."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2936,7 +2952,7 @@ msgstr ""
 "No se han podido descargar algunos archivos de รญndice, se han ignorado, o se "
 "ha utilizado unos antiguos en su lugar."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta el directorio de listas %spartial."
@@ -2973,17 +2989,17 @@ msgstr "No se pudo encontrar el mรฉtodo %s."
 msgid "Method %s did not start correctly"
 msgstr "El mรฉtodo %s no se iniciรณ correctamente"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, inserte el disco ยซ%sยป en la unidad ยซ%sยป y pulse Intro."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "No estรก soportado el sistema de paquetes ยซ%sยป"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
 
@@ -3016,8 +3032,6 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
-"El valor ยซ%sยป es invรกlido para APT::Default-Release dado que esa versiรณn no "
-"estรก disponible en las fuentes"
 
 #: apt-pkg/policy.cc:399
 #, c-format
@@ -3041,14 +3055,14 @@ msgstr "La cachรฉ tiene una versiรณn incompatible de sistema de versiones"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
@@ -3073,27 +3087,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Vaya, excediรณ el nรบmero de dependencias que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Al procesar las dependencias de archivos no se encontrรณ el paquete %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No se puede leer la lista de paquetes fuente %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Leyendo lista de paquetes"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Recogiendo archivos que proveen"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Error de E/S guardando cachรฉ fuente"
 
@@ -3106,49 +3120,45 @@ msgstr "fallรณ el cambio de nombre, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 difiere"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
-"No se pudo encontrar la entrada esperada ยซ%sยป en el archivo Release (entrada "
-"incorrecta en sources.list o archivo mal formado)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "No se pudo leer el archivo ยซReleaseยป %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "No existe ninguna clave pรบblica disponible para los siguientes "
 "identificadores de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"El archivo de la versiรณn de %s ha caducado (no vรกlido desde %s). Las "
-"actualizaciones de este repositorio no se aplicarรกn."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuciรณn conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Se produjo un error durante la verificaciรณn de las firmas. El repositorio no "
@@ -3156,12 +3166,12 @@ msgstr ""
 "GPG es: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3171,7 +3181,7 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3180,7 +3190,7 @@ msgstr ""
 "No se pudo localizar un archivo para el paquete %s. Esto puede significar "
 "que necesita arreglar manualmente este paquete."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3188,31 +3198,31 @@ msgstr ""
 "Los archivos de รญndice de paquetes estรกn daรฑados. No existe un campo "
 "ยซFilename:ยป para el paquete %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "El tamaรฑo difiere"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "No se pudo leer el archivo ยซReleaseยป %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "No se encontraron secciones en el archivo ยซReleaseยป %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "No existe una entrada ยซHashยป en el archivo ยซReleaseยป %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Entrada ยซValid-Untilยป invรกlida en el archivo ยซReleaseยป %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada ยซDateยป invรกlida en el archivo ยซReleaseยป %s"
@@ -3240,7 +3250,7 @@ msgstr "Identificando.. "
 msgid "Stored label: %s\n"
 msgstr "Etiqueta guardada: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando el CD-ROM...\n"
 
@@ -3304,30 +3314,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copiando las listas de paquetes..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Escribiendo nueva lista de fuente\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Las entradas de la lista de fuentes para este disco son:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i registros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i registros escritos con %i fichero de menos.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i registros escritos con %i fichero mal emparejado\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3343,17 +3353,6 @@ msgstr "No se pudo encontrar un registro de autenticaciรณn para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "La suma hash difiere para: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "El archivo %s no comienza con un mensaje limpio de firma"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No se instalรณ ningรบn anillo de claves %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3413,131 +3412,131 @@ msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr "Enviar escenario al resolutor"
+msgstr ""
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr "Enviar peticiรณn al resolutor"
+msgstr ""
 
 #: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
-msgstr "Preparar para recibir soluciรณn"
+msgstr ""
 
 #: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
-msgstr "El resolutor externo fallรณ sin un mensaje de error adecuado"
+msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
-msgstr "Ejecutar resolutor externo"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Borrando completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Se detectรณ la desapariciรณn de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Ejecutando disparador post-instalaciรณn %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio ยซ%sยป."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No pude abrir el fichero ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparรกndose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparรกndose para eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparรกndose para eliminar completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Se borrรณ completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No pudo escribirse el registro, fallรณ la llamada a openpty() (ยฟestรก montado "
 "ยซ/dev/pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Ejecutando dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
-msgstr "La operaciรณn se interrumpiรณ antes de que pudiera terminar"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "No se escribiรณ ningรบn informe ยซapportยป porque ya se ha alcanzado el valor de "
 "ยซMaxReportsยป"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - dejando sin instalar"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3545,7 +3544,7 @@ msgstr ""
 "No se escribiรณ un informe ยซapportยป porque el mensaje de error indica que es "
 "un mensaje de error asociado a un fallo previo."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3561,15 +3560,7 @@ msgstr ""
 "No se escribiรณ un informe ยซapportยป porque el mensaje de error indica un "
 "error de memoria excedida"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"No hay informe de apport escrito, porque el mensaje de error indica un "
-"problema en el sistema local"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3604,22 +3595,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "No bloqueado"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Algo raro pasรณ al resolver ยซ%s:%sยป (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Hecho"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Se produjo un error durante la verificaciรณn de las firmas. El repositorio "
-#~ "no estรก actualizado y se utilizarรกn los ficheros de รญndice antiguos. El "
-#~ "error GPG es: %s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Omitiendo el fichero inexistente %s"
 
diff --git a/po/eu.po b/po/eu.po
index 86dcc1f34..8cea79e8f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -97,75 +97,75 @@ msgstr "Guztira erregistratutako lekua: "
 msgid "Package file %s is out of sync."
 msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Ez da paketerik aurkitu"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ezin da %s paketea lokalizatu"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
 "pakete fitxategi bati"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,22 +237,30 @@ msgstr ""
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mesedez sar diska bat gailuan eta enter sakatu"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
 
@@ -448,7 +456,7 @@ msgstr "%s paketeak ez du instalatzeko hautagairik"
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "'%s bezalako pakete birtualak ezin dira ezabatu\n"
+msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -486,7 +494,7 @@ msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
@@ -595,8 +603,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -635,7 +643,7 @@ msgstr "Abortatu."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
@@ -644,7 +652,7 @@ msgstr "Ezin da lortu %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
@@ -686,7 +694,6 @@ msgstr ""
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
-"Lortu ezin den '%s' helburu bertsioa saltatu egin da '%s' paketearentzat."
 
 #: cmdline/apt-get.cc:1593
 #, fuzzy, c-format
@@ -697,7 +704,7 @@ msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 #: cmdline/apt-get.cc:1631
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Saltatu ez dagoen '%s' bertsioa '%s' paketearentzat"
+msgstr ""
 
 #: cmdline/apt-get.cc:1647
 msgid "The update command takes no arguments"
@@ -725,7 +732,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
@@ -782,7 +789,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -794,88 +801,85 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Eginda"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"OHARRA:  '%s' paketea hemen dagoen '%s' bertsio-kontrol sisteman mantentzen "
-"da:\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -883,87 +887,87 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -971,7 +975,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -979,14 +983,14 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
 "paketea berriegia da"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -995,7 +999,7 @@ msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
 "betetzen dituen %3$s paketearen bertsio erabilgarririk"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1003,30 +1007,30 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1113,18 +1117,13 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"OHARRA: Hau proba bat besterik ez da.\n"
-"      apt-get-ek super-erabiltzaile baimenak behar ditu benetan "
-"exekutatzeko.\n"
-"      Kontuan hartu blokeoa ere desaktibatuta dagoela\n"
-"      beraz, ez izan egungo egoera errealaren menpeko!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1189,7 +1188,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
@@ -1330,8 +1330,8 @@ msgstr "Konexioa denboraz kanpo"
 msgid "Server closed the connection"
 msgstr "Zerbitzariak konexioa itxi du"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Irakurketa errorea"
 
@@ -1344,8 +1344,8 @@ msgid "Protocol corruption"
 msgstr "Protokolo hondatzea"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Idazketa errorea"
 
@@ -1400,7 +1400,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1427,87 +1427,100 @@ msgstr "Kontsulta"
 msgid "Unable to invoke "
 msgstr "Ezin da deitu "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ezin izan da konektatu -> %s:%s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Konektatzen -> %s..."
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ezin izan da '%s' ebatzi"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Aldi baterako akatsa '%s' ebaztean"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ezin da konektatu -> %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1547,53 +1560,53 @@ msgstr "http zerbitzariak barruti onarpena apurturik du"
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Barne errorea"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
@@ -1620,7 +1633,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "%s fitxategia ezin izan da ireki"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1714,7 +1732,7 @@ msgstr ""
 "  -c=? Irakurri konfigurazio fitxategi hau\n"
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s : ezin da idatzi"
@@ -1859,8 +1877,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Ezin da ireki %s datu-base fitxategia: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Huts egin du %s(e)tik datuak lortzean"
@@ -1873,87 +1891,87 @@ msgstr "Artxiboak ez du kontrol erregistrorik"
 msgid "Unable to get a cursor"
 msgstr "Ezin da kurtsorerik eskuratu"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Ezin da %s direktorioa irakurri\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Ezin da %s atzitu\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Erroreak fitxategiari dagozkio "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Huts egin du %s ebaztean"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Huts egin dute zuhaitz-urratsek"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Huts egin du %s irekitzean"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Huts egin du %s esteka irakurtzean"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Huts egin du %s desestekatzean"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-en mugara (%sB) heldu da.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Artxiboak ez du pakete eremurik"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s: ez du override sarrerarik\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s mantentzailea %s da, eta ez %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
@@ -2027,7 +2045,7 @@ msgstr "Huts egin du MD5 konputatzean"
 msgid "Problem unlinking %s"
 msgstr "Arazoa %s desestekatzean"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
@@ -2085,23 +2103,23 @@ msgstr ""
 "  -c=? Irakurri konfigurazio fitxategi hau\n"
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Huts egin du kanalizazioak sortzean"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Huts egin du gzip exekutatzean "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Hondatutako artxiboa"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
@@ -2172,54 +2190,54 @@ msgstr "Ezin izan da %s fitxategian idatzi"
 msgid "Failed to close file %s"
 msgstr "Ezin izan da %s fitxategia itxi"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s bidea luzeegia da"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s behin baino gehiagotan deskonprimitzen"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s direktorioa desbideratuta dago"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Desbideratzearen bidea luzeegia da"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s direktorioa ez-direktorio batekin ordezten ari da"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Bidea luzeegia da"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ezin da daturik lortu %s(e)tik"
@@ -2300,30 +2318,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"
@@ -2393,6 +2411,16 @@ msgstr "%c%s... Errorea!"
 msgid "%c%s... Done"
 msgstr "%c%s... Eginda"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Eginda"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2454,117 +2482,123 @@ msgstr "Huts egin du CDROMa atzitzean"
 msgid "Problem closing the gzip file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo "
 "fitxategiarentzat"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ezin izan da %s blokeo fitxategia ireki"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ezin izan da %s blokeoa hartu"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s azpiprozesua ustekabean amaitu da"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Huts egin du IPC azpiprozesua sortzean"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Huts egin du konpresorea exekutatzean "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Arazoa fitxategia desestekatzean"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Paketeen katxea hutsik"
@@ -2591,59 +2625,59 @@ msgstr "APT honek ez du '%s' bertsio sistema onartzen"
 msgid "The package cache was built for a different architecture"
 msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Mendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Aurremendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Iradokizuna:"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Gomendioa:"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Gatazka:"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Ordeztea:"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Zaharkitzea:"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Apurturik"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
-msgstr "Hobekuntzak"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "garrantzitsua"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "beharrezkoa"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "estandarra"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "aukerakoa"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "estra"
 
@@ -2743,29 +2777,29 @@ msgstr "%s irekitzen"
 msgid "Line %u too long in source list %s."
 msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2789,7 +2823,7 @@ msgid ""
 msgstr ""
 "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2797,11 +2831,11 @@ msgstr ""
 "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
 "atxikitako paketeek eraginda."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2810,7 +2844,7 @@ msgstr ""
 "Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
 "zaharrak erabili dira haien ordez."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "%spartial zerrenda-direktorioa falta da."
@@ -2847,17 +2881,17 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 msgid "Method %s did not start correctly"
 msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' pakete sistema ez da onartzen"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
 
@@ -2910,14 +2944,14 @@ msgstr "Katxearen bertsio sistema ez da bateragarria"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
@@ -2938,26 +2972,26 @@ msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Pakete Zerrenda irakurtzen"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Fitxategiaren erreferentziak biltzen"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "S/I errorea iturburu katxea gordetzean"
 
@@ -2970,53 +3004,53 @@ msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ez dator bat"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3025,7 +3059,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,7 +3068,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3042,31 +3076,31 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
@@ -3094,7 +3128,7 @@ msgstr "Egiaztatzen... "
 msgid "Stored label: %s\n"
 msgstr "Gordetako Etiketa: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM Desmuntatzen...\n"
 
@@ -3156,30 +3190,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Pakete zerrendak kopiatzen..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Jatorri zerrenda berria idazten\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Diskoarentzako jatorri sarrerak:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3195,17 +3229,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortatu instalazioa."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3269,121 +3292,121 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfiguratzen"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
 "muntaturik?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3395,13 +3418,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3431,14 +3448,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Eginda"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "%s konfigurazio fitxategia irekitzen"
 
diff --git a/po/fi.po b/po/fi.po
index 8291af053..36a96a4be 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -97,73 +97,73 @@ msgstr "Kรคytetty tila yhteensรค: "
 msgid "Package file %s is out of sync."
 msgstr "Pakettitiedosto %s ei ole ajan tasalla."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Yhtรครคn pakettia ei lรถytynyt"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "On annettava tรคsmรคlleen yksi lauseke"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakettia %s ei lรถydy"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei lรถydy kansiosta"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ei lรถydy)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ei mitรครคn)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s kรครคnnรถksen pรคivรคys %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,21 +235,29 @@ msgstr ""
 "  -o=? Aseta mikรค asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 "Lisรคtietoja apt-cache(8) ja apt.conf(5) kรคsikirjasivuilla.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Aseta levy asemaan ja paina Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Toista tรคmรค lopuille rompuille kasassasi."
 
@@ -445,7 +453,7 @@ msgstr "Paketilla %s ei ole asennettavaa valintaa"
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtuaalipaketteja, kuten โ€%sโ€, ei voi poistaa\n"
+msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -483,7 +491,7 @@ msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitรค ei voi noutaa.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty kรคyttรคjรคn toimesta asennetuksi.\n"
@@ -591,8 +599,8 @@ msgstr "Toiminnon jรคlkeen kรคytetรครคn %s t lisรครค levytilaa.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jรคlkeen vapautuu %s t levytilaa.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan mรครคrรค ei selvinnyt"
@@ -632,7 +640,7 @@ msgstr "Keskeytรค."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
@@ -641,7 +649,7 @@ msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja mรครคrรคtty vain nouto"
 
@@ -682,7 +690,7 @@ msgstr ""
 #: cmdline/apt-get.cc:1561
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "ร„lรค vรคlitรค puuttuvasta kohdejulkaisusta '%s' paketissa '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1593
 #, fuzzy, c-format
@@ -693,7 +701,7 @@ msgstr "stat ei toiminut lรคhdepakettiluettelolle %s"
 #: cmdline/apt-get.cc:1631
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "ร„lรค vรคlitรค puuttuvasta versiosta '%s' paketissa '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1647
 msgid "The update command takes no arguments"
@@ -722,7 +730,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyรถtyรค selvitettรคessรค tilannetta:"
 
@@ -779,7 +787,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -790,88 +798,85 @@ msgstr ""
 "jos kรคytetรครคn epรคvakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielรค luotu tai siirretty Incoming-kansiosta."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Rikkinรคiset paketit"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimรครคrรคiset paketit on merkitty asennettaviksi:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei lรถytynyt"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s on merkitty kรคyttรคjรคn toimesta asennetuksi.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Kรคsitellรครคn pรคivitystรค ... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Valmis"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisรคinen virhe, resolver rikkoi jotain"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Noudetaan %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "On annettava ainakin yksi paketti jonka lรคhdekoodi noudetaan"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lรคhdekoodipakettia ei lรถytynyt"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"HUOM: \"%s\"-paketin paketointia yllรคpidetรครคn \"%s\"-"
-"versionhallintajรคrjestelmรคssรค osoitteessa:\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -879,86 +884,86 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kansiossa %s ei ole riittรคvรคsti vapaata tilaa"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lรคhdekoodiarkistoja.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lรคhdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lรคhdekoodi %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ohitetaan purku jo puretun lรคhdekoodin %s kohdalla\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole mรครคritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -966,7 +971,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttรครค koska pakettia %s ei lรถydy"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -974,14 +979,14 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttรครค koska pakettia %s ei lรถydy"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Riippuvutta %s paketille %s ei voi tyydyttรครค: Asennettu paketti %s on liian "
 "uusi"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -990,7 +995,7 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttรครค koska mikรครคn paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -998,30 +1003,30 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttรครค koska pakettia %s ei lรถydy"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttรครค: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttรครค."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien kรคsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1107,7 +1112,7 @@ msgstr ""
 "lisรคtietoja ja lisรครค valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1178,7 +1183,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitรค ei ollut"
@@ -1316,8 +1322,8 @@ msgstr "Yhteys aikakatkaistiin"
 msgid "Server closed the connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lukuvirhe"
 
@@ -1330,8 +1336,8 @@ msgid "Protocol corruption"
 msgstr "Yhteyskรคytรคntรถ on turmeltunut"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Virhe kirjoitettaessa"
 
@@ -1385,7 +1391,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttรค ei voitu hyvรคksyรค"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1412,88 +1418,101 @@ msgstr "Kysely"
 msgid "Unable to invoke "
 msgstr "Kรคynnistys ei onnistu"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Yhteyttรค %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Yhteyttรค %s ei voitu muodostaa: %s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Avataan yhteys %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nimeรค \"%s\" ei voitu selvittรครค"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tilapรคinen hรคiriรถ selvitettรคessรค \"%s\""
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Jotain kenkkua tapahtui selvitettรคessรค \"%s: %s\" (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Jotain kenkkua tapahtui selvitettรคessรค \"%s: %s\" (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttรค %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Sisรคinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjรคlki tuntematon?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Lร–ytyi ainakin yksi kelvoton allekirjoitus."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Ei kรคynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivรคt olleet kelvollisia:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1533,53 +1552,53 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 msgid "Unknown date format"
 msgstr "Tuntematon pรคivรคysmuoto"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etรคpรครค sulki yhteyden"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Sisรคinen virhe"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
@@ -1597,7 +1616,7 @@ msgstr "Kansioon %s vaihto ei onnistu"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Peilitiedostoa \"%s\" ei lรถydy "
+msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1606,10 +1625,15 @@ msgstr "Peilitiedostoa \"%s\" ei lรถydy "
 msgid "Can not read mirror file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Tiedostoa %s ei voitu avata"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
-msgstr "[Peili: %s]"
+msgstr ""
 
 #: methods/rred.cc:491
 #, c-format
@@ -1701,7 +1725,7 @@ msgstr ""
 "  -c=? Lue tรคmรค asetustiedosto\n"
 "  -o=? Aseta mikรค asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -1850,8 +1874,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
@@ -1864,87 +1888,87 @@ msgstr "Arkistolla ei ole ohjaustietuetta"
 msgid "Unable to get a cursor"
 msgstr "Kohdistinta ei saada"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Kansiota %s ei voi lukea\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Tdstolle %s ei toimi stat\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Tiedostossa virheitรค "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Osoitteen %s selvitys ei onnistunut"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Puun lรคpikรคynti ei onnistunut"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink %s ei onnistunut"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "unlink %s ei onnistunut"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Linkin %s -> %s luonti ei onnistunut"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLinkin ylรคraja %st saavutettu.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arkistossa ei ollut pakettikenttรครค"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s:llรค ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s yllรคpitรคjรค on %s eikรค %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s:llรค ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s:llรค ei  ole binรครคristรคkรครคn poikkeustietuetta\n"
@@ -2018,7 +2042,7 @@ msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttรค"
 msgid "Problem unlinking %s"
 msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
@@ -2076,23 +2100,23 @@ msgstr ""
 "  -c=? Lue tรคmรค asetustiedosto\n"
 "  -o=? Aseta mikรค asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Putkien luonti ei onnistunut"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "exec gzip ei onnistunut"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Arkisto on turmeltunut"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-ohjelman laskema tarkistussumma ei tรคsmรครค, arkisto on turmeltunut"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
@@ -2163,54 +2187,54 @@ msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
 msgid "Failed to close file %s"
 msgstr "Tiedoston %s sulkeminen ei onnistunut"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Polku %s on liian pitkรค"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Purettiin %s useammin kuin kerran"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Kansio %s on korvautunut"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketti yrittรครค kirjoittaa korvautuksen kohteeseen %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Korvautuspolku on liian pitkรค"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Solmua ei lรถytynyt sen hajautuslokerosta"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Polku on liian pitkรค"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pรครคlle kirjoitettava paketti tรคsmรครค mutta paketille %s ei ole versiota"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen pรครคlle"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
@@ -2290,30 +2314,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei lรถydy"
@@ -2383,6 +2407,16 @@ msgstr "%c%s... Virhe!"
 msgid "%c%s... Done"
 msgstr "%c%s... Valmis"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Valmis"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2443,114 +2477,120 @@ msgstr "Komento stat ei toiminut rompulle"
 msgid "Problem closing the gzip file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Lukkoa ei kรคytetรค kirjoitussuojatulle tiedostolle %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Lukkotiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Lukitusta ei kรคytetรค NFS-liitetylle tiedostolle %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Lukkoa %s ei saada"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Aliprosessi %s palautti virhekoodin (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Aliprosessi %s lopetti odottamatta"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Putkea %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Prosessien vรคlistรค kommunikaatiota aliprosessiin ei saatu luotua"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Pakkaajan kรคynnistรคminen ei onnistunut"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "read, vielรค %lu lukematta mutta tiedosto loppui"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "write, vielรค %lu kirjoittamatta mutta epรคonnistui"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Pulmia tehtรคessรค tiedostolle sync"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Pulmia tehtรคessรค tiedostolle unlink"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Pulmia tehtรคessรค tiedostolle sync"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetรครคn."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Pakettivarasto on tyhjรค"
@@ -2577,59 +2617,59 @@ msgstr "Tรคmรค APT ei tue versionhallintajรคrjestelmรครค \"%s\""
 msgid "The package cache was built for a different architecture"
 msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Tรคydet korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Rikkoo"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
-msgstr "Parantaa"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "tรคrkeรค"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "vรคlttรคmรคtรถn"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "perus"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "valinnainen"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ylimรครคrรคinen"
 
@@ -2729,29 +2769,29 @@ msgstr "Avataan %s"
 msgid "Line %u too long in source list %s."
 msgstr "Rivi %u on liian pitkรค lรคhdeluettelossa %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Rivi %u on vรครคrรคn muotoinen lรคhdeluettelossa %s (tyyppi)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tyyppi \"%s\" on tuntematon rivillรค %u lรคhdeluettelossa %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2773,7 +2813,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei lรถydy."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2781,11 +2821,11 @@ msgstr ""
 "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynรค voi olla pysytetyt "
 "paketit."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinรคisiรค paketteja on pysytetty."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2794,7 +2834,7 @@ msgstr ""
 "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
 "kรคytetty vanhoja. "
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Luettelokansio %spartial puuttuu."
@@ -2831,17 +2871,17 @@ msgstr "Menetelmรคn ajuria %s ei lรถytynyt"
 msgid "Method %s did not start correctly"
 msgstr "Menetelmรค %s ei kรคynnistynyt oikein"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Pistรค levy nimeltรครคn: \"%s\" asemaan \"%s\" ja paina Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketointijรคrjestelmรค \"%s\" ei ole tuettu"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Sopivaa paketointijรคrjestelmรคn tyyppiรค ei saa selvitettyรค"
 
@@ -2895,14 +2935,14 @@ msgstr "Pakettivaraston versionhallintajรคrjestelmรค ei ole yhteensopiva"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Tapahtui virhe kรคsiteltรคessรค %s (FindPkg)"
@@ -2924,26 +2964,26 @@ msgstr "Jummijammi, tรคmรค APT ei osaa kรคsitellรค noin montaa kuvausta."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jummijammi, annoit enemmรคn riippuvuuksia kuin tรคmรค APT osaa kรคsitellรค."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pakettia %s %s ei lรถytynyt kรคsiteltรคessรค tiedostojen riippuvuuksia."
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "stat ei toiminut lรคhdepakettiluettelolle %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Luetaan pakettiluetteloita"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Kootaan tiedostojen tarjoamistietoja"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Syรถttรถ/Tulostus -virhe tallennettaessa pakettivarastoa"
 
@@ -2956,53 +2996,53 @@ msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ei tรคsmรครค"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Tarkistussumma ei tรคsmรครค"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Pakettitiedostoa %s (1) ei voi jรคsentรครค"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr "GPG-virhe: %s: %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3011,7 +3051,7 @@ msgstr ""
 "En lรถytรคnyt pakettia %s vastaavaa tiedostoa. Voit ehkรค joutua korjaamaan "
 "tรคmรคn paketin itse (puuttuvan arkkitehtuurin vuoksi)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3020,7 +3060,7 @@ msgstr ""
 "Pakettia %s vastaavaa tiedostoa ei lรถytynyt. Voit ehkรค joutua korjaamaan "
 "tรคmรคn paketin itse."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3028,31 +3068,31 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttรครค."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Koko ei tรคsmรครค"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Pakettitiedostoa %s (1) ei voi jรคsentรครค"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Huomautus, valitaan %s eikรค %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Virheellinen rivi korvautustiedostossa: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Pakettitiedostoa %s (1) ei voi jรคsentรครค"
@@ -3080,7 +3120,7 @@ msgstr "Tunnistetaan... "
 msgid "Stored label: %s\n"
 msgstr "Tallennettu nimio: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Irrotetaan romppu...\n"
 
@@ -3142,30 +3182,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopioidaan pakettiluetteloita..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Kirjoitetaan uusi lรคhdeluettelo\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Tรคmรคn levyn lรคhdekoodipakettien luettelon tietueita ovat:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3182,17 +3222,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Kohteen %s tarkistussumma ei tรคsmรครค"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Asennus keskeytetรครคn."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3256,121 +3285,121 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Tehdรครคn asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr "Huomautus paketin %s katoamisesta"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Suoritetaan jรคlkiasennusliipaisin %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemรครคn asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Lokiin ei voi kirjoittaa, openpty() epรคonnistui (onko /dev/pts "
 "liittรคmรคttรค?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
-msgstr "Suoritetaan dpkg-ohjelmaa"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
-msgstr "riippuvuusongelmia - jรคtetรครคn asetukset sรครคtรคmรคttรค"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3382,13 +3411,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3415,15 +3438,7 @@ msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
-msgstr "Ei lukittu"
-
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Jotain kenkkua tapahtui selvitettรคessรค \"%s: %s\" (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Valmis"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Skipping nonexistent file %s"
diff --git a/po/fr.po b/po/fr.po
index 24856be6c..45b16cb5a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2013-04-09 07:58+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -97,72 +97,72 @@ msgstr "Total de l'espace attribuรฉย : "
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s dรฉsynchronisรฉ."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Aucun paquet n'a รฉtรฉ trouvรฉ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir au moins un motif de recherche"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Cette commande est obsolรจte. Veuillez utiliser ยซย apt-mark showautoย ยป."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Fichiers du paquetย :"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Le cache est dรฉsynchronisรฉ, impossible de rรฉfรฉrencer un fichier"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Paquets รฉpinglรฉsย :"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(non trouvรฉ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installรฉย : "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidatย : "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ร‰pinglage de paquetย : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr " Table de versionย :"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilรฉ sur %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,22 +236,30 @@ msgstr ""
 "plus\n"
 "d'informations.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Veuillez indiquer le nom de ce disque, par exemple ยซย Debian 5.0.3 Disk 1ย ยป"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 "Veuillez insรฉrer un disque dans le lecteur et appuyez sur la touche Entrรฉe"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Impossible de monter ยซย %sย ยป sur ยซย %sย ยป"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "Veuillez rรฉpรฉter cette opรฉration pour tous les disques de votre jeu de "
@@ -493,7 +501,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "%s est dรฉjร  la plus rรฉcente version disponible.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passรฉ en ยซย installรฉ manuellementย ยป.\n"
@@ -604,8 +612,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Aprรจs cette opรฉration, %so d'espace disque seront libรฉrรฉs.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de dรฉterminer l'espace disponible sur %s"
@@ -648,7 +656,7 @@ msgstr "Annulation."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n]ย ? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de rรฉcupรฉrer %s  %s\n"
@@ -657,7 +665,7 @@ msgstr "Impossible de rรฉcupรฉrer %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu รชtre tรฉlรฉchargรฉs."
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Tรฉlรฉchargement achevรฉ et dans le mode tรฉlรฉchargement uniquement"
 
@@ -747,7 +755,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider ร  rรฉsoudre la situationย : "
 
@@ -801,7 +809,7 @@ msgstr ""
 "Dรฉpendances non satisfaites. Essayez ยซย apt-get -f installย ยป sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -813,33 +821,33 @@ msgstr ""
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "รฉtรฉ crรฉรฉs ou ne sont pas sortis d'Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Paquets dรฉfectueux"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplรฉmentaires suivants seront installรฉsย : "
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Paquets suggรฉrรฉsย :"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Paquets recommandรฉsย :"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s passรฉ en ยซย installรฉ automatiquementย ยป.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -847,50 +855,50 @@ msgstr ""
 "Cette commande est obsolรจte. Veuillez utiliser ยซย apt-mark autoย ยป et ยซย apt-"
 "mark manualย ยป."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise ร  jour... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ร‰chec"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de rรฉsolution du problรจme a cassรฉ certaines "
 "parties"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le rรฉpertoire de tรฉlรฉchargement"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "Impossible de trouver une source de tรฉlรฉchargement de la version ยซย %sย ยป de "
 "ยซย %sย ยป"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Tรฉlรฉchargement de %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez spรฉcifier au moins un paquet source"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -900,7 +908,7 @@ msgstr ""
 "suivi de versions ยซย %sย ยป ร  l'adresseย :\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -912,70 +920,70 @@ msgstr ""
 "pour rรฉcupรฉrer les derniรจres mises ร  jour (รฉventuellement non encore "
 "publiรฉes) du paquet.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saut du tรฉlรฉchargement du fichier ยซย %sย ยป, dรฉjร  tรฉlรฉchargรฉ\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nรฉcessitรฉ de prendre %so/%so dans les sources.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Nรฉcessitรฉ de prendre %so dans les sources.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Rรฉcupรฉration des sources %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ร‰chec lors de la rรฉcupรฉration de quelques archives."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du dรฉcompactage des paquets sources dรฉjร  dรฉcompactรฉs dans %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de dรฉcompactage ยซย %sย ยป a รฉchouรฉ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez vรฉrifier si le paquet dpkg-dev est installรฉ.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction ยซย %sย ยป a รฉchouรฉ.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ร‰chec du processus fils"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut spรฉcifier au moins un paquet pour vรฉrifier les dรฉpendances de "
 "construction"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -985,17 +993,17 @@ msgstr ""
 "consulter la section ร  propos de APT::Architectures dans la page de manuel "
 "apt.conf(5)."
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les dรฉpendances de construction pour %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dรฉpendance de construction.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1004,7 +1012,7 @@ msgstr ""
 "La dรฉpendance %s vis-ร -vis de %s ne peut รชtre satisfaite car %s n'est pas "
 "autorisรฉ avec les paquets ยซย %sย ยป."
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1013,14 +1021,14 @@ msgstr ""
 "La dรฉpendance %s vis-ร -vis de %s ne peut รชtre satisfaite car le paquet %s ne "
 "peut รชtre trouvรฉ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Impossible de satisfaire la dรฉpendance %s pour %sย : le paquet installรฉ %s "
 "est trop rรฉcent"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1029,7 +1037,7 @@ msgstr ""
 "La dรฉpendance %s vis-ร -vis de %s ne peut รชtre satisfaite car aucune version "
 "disponible du paquet %s ne peut satisfaire les prรฉrequis de version."
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1038,31 +1046,31 @@ msgstr ""
 "La dรฉpendance %s vis-ร -vis de %s ne peut รชtre satisfaite car le paquet %s "
 "n'a pas de version disponible."
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les dรฉpendances %s pour %sย : %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 "Les dรฉpendances de compilation pour %s ne peuvent pas รชtre satisfaites."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dรฉpendances de construction"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Modules reconnusย :"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1131,7 +1139,7 @@ msgstr ""
 "  check - Vรฉrifie qu'il n'y a pas de rupture de dรฉpendances\n"
 "  changelog - Tรฉlรฉcharge et affiche le journal des modifications\n"
 "              (ยซย  changelogย ยป) du paquet indiquรฉ\n"
-"  download - Tรฉlรฉcharge le paquet dinaire dans le rรฉpertoire courant\n"
+"  download - Tรฉlรฉcharge le paquet binaire dans le rรฉpertoire courant\n"
 "\n"
 "Optionsย :\n"
 "  -h Ce texte d'aide\n"
@@ -1152,7 +1160,7 @@ msgstr ""
 "apt.conf(5) pour plus d'informations et d'options.\n"
 "                      Cet APT a les ยซย Super Cow Powersย ยป\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1229,7 +1237,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s รฉtait dรฉjร  marquรฉ comme non figรฉ.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'รฉtait pas prรฉsent"
@@ -1394,8 +1403,8 @@ msgstr "Dรฉpassement du dรฉlai de connexion"
 msgid "Server closed the connection"
 msgstr "Le serveur a fermรฉ la connexion"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Erreur de lecture"
 
@@ -1408,8 +1417,8 @@ msgid "Protocol corruption"
 msgstr "Corruption du protocole"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Erreur d'รฉcriture"
 
@@ -1464,7 +1473,7 @@ msgstr "Dรฉlai de connexion au port de donnรฉes dรฉpassรฉ"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problรจme de hachage du fichier"
 
@@ -1491,91 +1500,104 @@ msgstr "Requรชte"
 msgid "Unable to invoke "
 msgstr "Impossible d'invoquer "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connexion ร  %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IPย : %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Impossible de crรฉer de connexion pour %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossible d'initialiser la connexion ร  %s:ย %s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Connexion ร  %s:ย %s (%s) impossible, dรฉlai de connexion dรฉpassรฉ"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Connexion ร  %s:ย %s (%s) impossible."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion ร  %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ne parvient pas ร  rรฉsoudre ยซย %sย ยป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Erreur temporaire de rรฉsolution de ยซย %sย ยป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Erreur systรจme lors de la rรฉsolution de ยซย %s:%sย ยป"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 "Quelque chose d'imprรฉvisible est survenu lors de la dรฉtermination de ยซย %s:"
 "%sย ยป (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossible de se connecter ร  %s:%sย :"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interneย : signature correcte, mais il est impossible de dรฉterminer "
 "l'empreinte de la clรฉ."
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a รฉtรฉ rencontrรฉe."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossible d'exรฉcuter ยซย gpgvย ยป pour contrรดler la signature (veuillez "
 "vรฉrifier si gpgv est installรฉ)."
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue ร  l'exรฉcution de gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valablesย :\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1615,53 +1637,53 @@ msgstr "Ce serveur http possรจde un support des limites non-valide"
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Sรฉlection dรฉfaillante"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Dรฉlai de connexion dรฉpassรฉ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Erreur d'รฉcriture du fichier de sortie"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Erreur d'รฉcriture sur un fichier"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Erreur d'รฉcriture sur le fichier"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erreur de lecture depuis le serveur distant et clรดture de la connexion"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Mauvais en-tรชte de donnรฉe"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ร‰chec de la connexion"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Erreur interne"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
@@ -1688,7 +1710,12 @@ msgstr "Aucun fichier miroir ยซย %sย ยป n'a รฉtรฉ trouvรฉ"
 msgid "Can not read mirror file '%s'"
 msgstr "Impossible de lire le fichier de miroir ยซย %sย ยป."
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Impossible de lire le fichier de miroir ยซย %sย ยป."
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Miroirย : %s]"
@@ -1787,7 +1814,7 @@ msgstr ""
 "   -c=? Lit ce fichier de configuration\n"
 "   -o=? Spรฉcifie une option de configuration, p.ย ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossible d'รฉcrire sur %s"
@@ -1937,8 +1964,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossible d'ouvrir le fichier de base de donnรฉes %sย : %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossible de statuer %s"
@@ -1951,87 +1978,87 @@ msgstr "L'archive n'a pas d'enregistrement de contrรดle"
 msgid "Unable to get a cursor"
 msgstr "Impossible d'obtenir un curseur"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Aย : Impossible de lire le contenu du rรฉpertoire %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Aย : Impossible de statuer %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "Eย : "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "Aย : "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "Eย : des erreurs sont survenues sur le fichier "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Impossible de rรฉsoudre %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ร‰chec du parcours de l'arbre"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Dรฉlier %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Impossible de lire le lien %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Impossible de dรฉlier %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Impossible de lier %s ร  %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Seuil de delink de %so atteint.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "L'archive ne possรจde pas de champ de paquet"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s ne possรจde pas d'entrรฉe ยซย overrideย ยป\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " le responsable de %s est %s et non %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ne possรจde pas d'entrรฉe ยซย source overrideย ยป\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ne possรจde pas รฉgalement pas d'entrรฉe ยซย binary overrideย ยป\n"
@@ -2105,7 +2132,7 @@ msgstr "Impossible de lire lors du calcul de la somme MD5"
 msgid "Problem unlinking %s"
 msgstr "Problรจme en dรฉliant %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Impossible de changer le nom %s en %s"
@@ -2166,23 +2193,23 @@ msgstr ""
 "  -o=? Place une option de configuration arbitraire, p.ย ex. -o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ร‰chec de crรฉation de tubes"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Impossible d'exรฉcuter gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Archive corrompue"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ร‰chec dans la somme de contrรดle de tar, l'archive est corrompue"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Type d'en-tรชte %u inconnu pour TAR, partie %s"
@@ -2253,54 +2280,54 @@ msgstr "Erreur d'รฉcriture du fichier %s"
 msgid "Failed to close file %s"
 msgstr "ร‰chec de clรดture du fichier %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Le chemin %s est trop long"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Veuillez dรฉcompresser %s plus d'une fois"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Le rรฉpertoire %s est dรฉtournรฉ"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Le paquet est en train d'essayer d'รฉcrire sur la cible dรฉtournรฉe %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Le chemin de dรฉviation est trop long"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Le rรฉpertoire %s va รชtre remplacรฉ par un non-rรฉpertoire"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ร‰chec pour localiser le nล“ud dans la table de hachage"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Le chemin est trop long"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "ร‰crase la correspondance de paquet sans version pour %s "
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Le fichier %s/%s รฉcrase celui inclus dans le paquet %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossible de statuer pour %s."
@@ -2385,30 +2412,30 @@ msgstr ""
 "automatique a รฉtรฉ dรฉsactivรฉe par une option utilisateur."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "La sรฉlection %s n'a pu รชtre trouvรฉe"
@@ -2482,6 +2509,16 @@ msgstr "%c%s... Erreurย !"
 msgid "%c%s... Done"
 msgstr "%c%s... Fait"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "โ€ฆ"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%sโ€ฆ %u%%"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2542,48 +2579,48 @@ msgstr "Impossible d'accรฉder au cรฉdรฉrom."
 msgid "Problem closing the gzip file %s"
 msgstr "Problรจme de fermeture du fichier gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Verrou non utilisรฉ pour le fichier %s en lecture seule"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossible d'ouvrir le fichier verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Verrou non utilisรฉ pour le fichier %s se situant sur une partition nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossible d'obtenir le verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 "La liste des fichiers ne peut pas รชtre crรฉรฉe car ยซย %sย ยป n'est pas un "
 "rรฉpertoire"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "ยซย %sย ยป dans le rรฉpertoire ยซย %sย ยป a รฉtรฉ ignorรฉ car ce n'est pas un fichier "
 "ordinaire"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "ยซย %sย ยป dans le rรฉpertoire ยซย %sย ยป a รฉtรฉ ignorรฉ car il n'utilise pas "
 "d'extension"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2591,73 +2628,79 @@ msgstr ""
 "ยซย %sย ยป dans le rรฉpertoire ยซย %sย ยป a รฉtรฉ ignorรฉ car il utilise une extension "
 "non valable"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Le sous-processus %s a commis une violation d'accรจs mรฉmoire"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Le sous-processus %s a reรงu le signal %u"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Le sous-processus %s a renvoyรฉ un code d'erreur (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Le sous-processus %s s'est arrรชtรฉ prรฉmaturรฉment"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossible d'ouvrir le descripteur de fichier %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Impossible de crรฉer un sous-processus IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Impossible d'exรฉcuter la compression "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lu(s), %llu restant ร  lire, mais rien n'est disponible"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "รฉcrit(s), %llu restant ร  รฉcrire, mais l'รฉcriture est impossible"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problรจme de fermeture du fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problรจme de renommage du fichier %s en %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problรจme de suppression du lien %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problรจme de synchronisation du fichier"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clรฉs installรฉ dans %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache des paquets vide"
@@ -2683,59 +2726,59 @@ msgstr "Cet APT ne supporte pas le systรจme de version ยซย %sย ยป"
 msgid "The package cache was built for a different architecture"
 msgstr "Le cache des paquets a รฉtรฉ construit pour une architecture diffรฉrente"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Dรฉpend"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Prรฉ-Dรฉpend"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Suggรจre"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recommande"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Est en conflit avec"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Remplace"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Rend obsolรจte"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Casse"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Amรฉliore"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "nรฉcessaire"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "optionnel"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "supplรฉmentaire"
 
@@ -2845,18 +2888,18 @@ msgstr "Ouverture de %s"
 msgid "Line %u too long in source list %s."
 msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Ligne %u mal formรฉe dans la liste des sources %s (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 "Le type ยซย %sย ยป est inconnu sur la ligne %u dans la liste des sources %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2866,12 +2909,12 @@ msgstr ""
 "consulter la page de manuel apt.conf(5) et notamment la section ร  propos de "
 "APT::Immediate-Configure, pour plus d'informations. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Impossible de configurer ยซย %sย ยป."
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2896,7 +2939,7 @@ msgstr ""
 "Le paquet %s doit รชtre rรฉinstallรฉ, mais il est impossible de trouver son "
 "archive."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2904,13 +2947,13 @@ msgstr ""
 "Erreur, pkgProblem::Resolve a gรฉnรฉrรฉ des ruptures, ce qui a pu รชtre causรฉ "
 "par les paquets devant รชtre gardรฉs en l'รฉtat."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Impossible de corriger les problรจmes, des paquets dรฉfectueux sont en mode "
 "ยซย garder en l'รฉtatย ยป."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2918,7 +2961,7 @@ msgstr ""
 "Le tรฉlรฉchargement de quelques fichiers d'index a รฉchouรฉ, ils ont รฉtรฉ "
 "ignorรฉs, ou les anciens ont รฉtรฉ utilisรฉs ร  la place."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Le rรฉpertoire %spartial pour les listes n'existe pas."
@@ -2955,19 +2998,19 @@ msgstr "Le pilote pour la mรฉthode %s n'a pu รชtre trouvรฉ."
 msgid "Method %s did not start correctly"
 msgstr "La mรฉthode %s n'a pas dรฉmarrรฉ correctement"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Veuillez insรฉrer le disque ยซย %sย ยป dans le lecteur ยซย %sย ยป et appuyez sur la "
 "touche Entrรฉe."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Le systรจme de paquet ยซย %sย ยป n'est pas supportรฉ"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossible de dรฉterminer un type du systรจme de paquets adรฉquat"
 
@@ -3027,14 +3070,14 @@ msgstr "Le cache possรจde un systรจme de version incompatible"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Erreur apparue lors du traitement de %s (%s%d)"
@@ -3063,28 +3106,28 @@ msgstr ""
 "Vous avez dรฉpassรฉ le nombre de dรฉpendances que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Le paquet %s %s n'a pu รชtre trouvรฉ lors du traitement des dรฉpendances des "
 "fichiers"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossible de localiser la liste des paquets sources %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lecture des listes de paquets"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Assemblage des fichiers listรฉs dans les champs Provides"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr ""
 "Erreur d'entrรฉe/sortie lors de la sauvegarde du fichier de cache des sources"
@@ -3098,12 +3141,12 @@ msgstr "impossible de changer le nom, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Somme de contrรดle MD5 incohรฉrente"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Somme de contrรดle de hachage incohรฉrente"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3112,18 +3155,18 @@ msgstr ""
 "Impossible de trouver l'entrรฉe ยซย %sย ยป attendue dans le fichier ยซย Releaseย ยปย : "
 "โ€ฏligne non valable dans sources.list ou fichier corrompu"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 "Impossible de trouver la comme de contrรดle de ยซย %sย ยป dans le fichier Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Aucune clรฉ publique n'est disponible pour la/les clรฉ(s) suivante(s)ย :\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3132,15 +3175,15 @@ msgstr ""
 "Le fichier ยซย Releaseย ยป pour %s a expirรฉ (plus valable depuis %s). Les mises "
 "ร  jour depuis ce dรฉpรดt  ne s'effectueront pas."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribution en conflitย :ย %s (%s attendu, mais %s obtenu)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Une erreur s'est produite lors du contrรดle de la signature. Le dรฉpรดt n'est "
@@ -3148,12 +3191,12 @@ msgstr ""
 "GPGย :ย %sย :ย %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erreur de GPGย :ย %sย :ย %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3162,7 +3205,7 @@ msgstr ""
 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
 "devrez corriger ce paquet vous-mรชme (absence d'architecture)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3171,7 +3214,7 @@ msgstr ""
 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
 "devrez corriger ce paquet vous-mรชme."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3179,31 +3222,31 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ ยซย Filename:ย ยป "
 "pour le paquet %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Taille incohรฉrente"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossible d'analyser le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Pas de sections dans le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Pas d'entrรฉe de hachage dans le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Entrรฉe ยซย Valid-Untilย ยป non valable dans le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrรฉe ยซย Dateย ยป non valable dans le fichier Release %s"
@@ -3231,7 +3274,7 @@ msgstr "Identification..."
 msgid "Stored label: %s\n"
 msgstr "ร‰tiquette stockรฉeย : %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Dรฉmontage du cรฉdรฉrom...\n"
 
@@ -3295,30 +3338,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copie des listes de paquets..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ร‰criture de la nouvelle liste de sources\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrรฉes de listes de sources pour ce disque sontย :\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i enregistrements รฉcrits.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i enregistrements รฉcrits avec %i fichiers manquants.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i enregistrements รฉcrits avec %i fichiers qui ne correspondent pas\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3335,17 +3378,6 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
 msgid "Hash mismatch for: %s"
 msgstr "Somme de contrรดle de hachage incohรฉrente pour %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Le fichier %s ne commence pas par un message signรฉ en clair."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clรฉs installรฉ dans %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3420,115 +3452,115 @@ msgstr "Prรฉparation ร  la rรฉception de la solution"
 msgid "External solver failed without a proper error message"
 msgstr "ร‰chec du solveur externe sans message d'erreur adaptรฉ"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Exรฉcu tion du solveur externe"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Suppression complรจte de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Disparition de %s constatรฉe"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Exรฉcution des actions diffรฉrรฉes (ยซย triggerย ยป) de %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Rรฉpertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossible d'ouvrir le fichier ยซย %sย ยป"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Prรฉparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Dรฉcompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Prรฉparation de la configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s installรฉ"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Prรฉparation de la suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimรฉ"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Prรฉparation de la suppression complรจte de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complรจtement supprimรฉ"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossible d'รฉcrire le journal, รฉchec d'openpty()\n"
 "(/dev/pts est-il montรฉย ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Exรฉcution de dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "L'opรฉration a รฉtรฉ interrompue avant de se terminer"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Aucun rapport ยซย apportย ยป รฉcrit car MaxReports a dรฉjร  รฉtรฉ atteint"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problรจme de dรฉpendancesย :ย laissรฉ non configurรฉ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3536,7 +3568,7 @@ msgstr ""
 "Aucun rapport ยซย apportย ยป n'a รฉtรฉ crรฉรฉ car le message d'erreur indique une "
 "erreur consรฉcutive ร  un รฉchec prรฉcรฉdent."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3551,15 +3583,7 @@ msgstr ""
 "Aucun ยซย apportย ยป n'a รฉtรฉ crรฉรฉ car une erreur de dรฉpassement de capacitรฉ "
 "mรฉmoire a รฉtรฉ signalรฉe"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Aucun rapport apport n'a รฉtรฉ รฉcrit car le message d'erreur indique un "
-"problรจme sur le systรจme local"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3596,22 +3620,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non verrouillรฉ"
 
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Erreur systรจme lors de la rรฉsolution de ยซย %s:%sย ยป"
-
-#~ msgid "..."
-#~ msgstr "โ€ฆ"
-
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%sโ€ฆ %u%%"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Une erreur s'est produite lors du contrรดle de la signature. Le dรฉpรดt "
-#~ "n'est pas mis ร  jour et les fichiers d'index prรฉcรฉdents seront utilisรฉs. "
-#~ "Erreur de GPGย :ย %sย :ย %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Le fichier %s ne commence pas par un message signรฉ en clair."
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Fichier %s inexistant ignorรฉ"
diff --git a/po/gl.po b/po/gl.po
index d95374203..dc776f9e2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -100,74 +100,74 @@ msgstr "Espazo total contabilizado: "
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro de paquete %s estรก sen sincronizar."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Non se atopou ningรบn paquete"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Debe fornecer cando menos un patrรณn de busca"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Esta orde รฉ obsoleta. Use ยซapt-mark showautoยป no seu canto."
+msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Non foi posรญbel atopar o paquete %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A cachรฉ estรก sen sincronizar, non se pode facer referencia a un ficheiro de "
 "paquetes"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(non se atopou)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ningรบn)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tรกboa de versiรณns:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,20 +241,28 @@ msgstr ""
 "Vexa a pรกxina de manual apt-cache(8) e apt.conf(5) para obter mais "
 "informaciรณn.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Forneza un nome para este disco, como ยซDebian 5.0.3 Disco 1ยป"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Insira un disco na unidade e prema Intro"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Produciuse un fallo ao montar ยซ%sยป en ยซ%sยป"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este proceso para o resto de CD do seu conxunto."
 
@@ -297,7 +305,7 @@ msgstr "S"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -488,7 +496,7 @@ msgstr "A reinstalaciรณn de %s non รฉ posรญbel, non se pode descargar.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s xa รฉ a versiรณn mรกis recente.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
@@ -599,8 +607,8 @@ msgstr "Despois desta operaciรณn ocuparanse %sB de disco adicionais.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operaciรณn liberaranse %sB de espazo de disco.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non foi posรญbel determinar o espazo libre en %s"
@@ -639,7 +647,7 @@ msgstr "Interromper."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non foi posรญbel obter %s  %s\n"
@@ -648,7 +656,7 @@ msgstr "Non foi posรญbel obter %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Non foi posรญbel descargar algรบns ficheiros"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de sรณ descargas"
 
@@ -735,7 +743,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informaciรณn pode axudar a solucionar a situaciรณn:"
 
@@ -787,7 +795,7 @@ msgstr ""
 "Dependencias incumpridas. Probe ยซapt-get -f installยป sen paquetes (ou "
 "especifique unha soluciรณn)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -800,79 +808,78 @@ msgstr ""
 "algรบns paquetes solicitados aรญnda non se creasen ou que se movesen da "
 "entrada."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Paquetes estragados"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Instalaranse os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Paquetes suxeridos:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non foi posรญbel atopar o paquete %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s estรก estabelecido para a sรบa instalaciรณn automรกtica.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Esta orde รฉ obsoleta. Use ยซapt-mark autoยป e ยซapt-mark manualยป no seu canto."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calculando a anovaciรณn... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Feito"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Non รฉ posรญbel bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Descargando %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Ten que especificar polo menos un paquete para obter o cรณdigo fonte"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non sรฉ posรญbel atopar un paquete fonte para %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -881,7 +888,7 @@ msgstr ""
 "AVISO: o paquete ยซ%sยป mantense no sistema de control de versiรณns ยซ%sยป en:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -893,89 +900,87 @@ msgstr ""
 "para obter as รบltimas actualizaciรณns (posibelmente non publicadas) do "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omรญtese o ficheiro xa descargado ยซ%sยป\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre abondo en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Ten que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Non se puideron obter algรบns arquivos."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omรญtese o desempaquetado do cรณdigo fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetado ยซ%sยป.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete ยซdpkg-devยป estea instalado.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a orde de construciรณn de ยซ%sยป.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar polo menos un paquete para comprobarlle as dependencias "
 "de compilaciรณn"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"Non hai dispoรฑรญbel informaciรณn da arquitectura para %s. Vea apt.conf(5) APT::"
-"Architectures para configurar"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non รฉ posรญbel obter a informaciรณn de dependencias de compilaciรณn de %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilaciรณn.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -984,7 +989,7 @@ msgstr ""
 "A dependencia ยซ%sยป de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -993,14 +998,14 @@ msgstr ""
 "A dependencia ยซ%sยป de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non foi posรญbel satisfacer a dependencia ยซ%sยป de %s: O paquete instalado %s "
 "รฉ novo de mรกis"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1009,7 +1014,7 @@ msgstr ""
 "A dependencia ยซ%sยป de %s non se pode satisfacer porque ningunha versiรณn "
 "dispoรฑรญbel do paquete %s satisfai os requirimentos de versiรณn"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1018,30 +1023,30 @@ msgstr ""
 "A dependencia ยซ%sยป de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non foi posรญbel satisfacer a dependencia ยซ%sยป de %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de construciรณn de %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Non se puideron procesar as dependencias de construciรณn"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรณdulos admitidos:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1134,7 +1139,7 @@ msgstr ""
 "para obter mais informaciรณn e opciรณns\n"
 "                       Este APT ten poderes da Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1210,7 +1215,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s xa รฉ a versiรณn mรกis recente.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alรญ"
@@ -1227,7 +1233,7 @@ msgstr "Non foi posรญbel abrir %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Non foi posรญbel executar dpkg. Vostede รฉ administrador (root)?"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1348,8 +1354,8 @@ msgstr "Esgotouse o tempo para a conexiรณn"
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexiรณn"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Produciuse un erro de lectura"
 
@@ -1362,8 +1368,8 @@ msgid "Protocol corruption"
 msgstr "Dano no protocolo"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Produciuse un erro de escritura"
 
@@ -1418,7 +1424,7 @@ msgstr "A conexiรณn do socket de datos esgotou o tempo"
 msgid "Unable to accept connection"
 msgstr "Non รฉ posรญbel aceptar a conexiรณn"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
 
@@ -1445,89 +1451,102 @@ msgstr "Peticiรณn"
 msgid "Unable to invoke "
 msgstr "Non รฉ posรญbel chamar a "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Non foi posรญbel crear un socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Non รฉ posรญbel iniciar a conexiรณn a %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Non foi posรญbel conectar a %s:%s (%s), a conexiรณn esgotou o tempo"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Non foi posรญbel conectar a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Non foi posรญbel atopar ยซ%sยป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Produciuse un fallo temporal ao buscar ยซ%sยป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Aconteceu algo malo, buscando ยซ%s:%sยป (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Aconteceu algo malo, buscando ยซ%s:%sยป (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Non รฉ posรญbel conectar %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non foi posรญbel determinar a pegada "
 "dixital da chave"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse polo menos unha sinatura incorrecta."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non รฉ posรญbel executar ยซgpgvยป para verificar a sinatura (Estรก instalado "
 "gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Produciuse un erro descoรฑecido ao executar gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran correctas:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1568,54 +1587,54 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
 msgid "Unknown date format"
 msgstr "Formato de datos descoรฑecido"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "A conexiรณn esgotou o tempo"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saรญda"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexiรณn"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexiรณn"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non รฉ posรญbel ler %s"
@@ -1642,7 +1661,12 @@ msgstr "Non se atopou ningรบn ficheiro de replica ยซ%sยป "
 msgid "Can not read mirror file '%s'"
 msgstr "Non รฉ posรญbel ler o ficheiro de replica ยซ%sยป"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Non รฉ posรญbel ler o ficheiro de replica ยซ%sยป"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Replica: %s]"
@@ -1740,7 +1764,7 @@ msgstr ""
 "  -o=? Estabelece unha opciรณn de configuraciรณn, por exemplo: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Non รฉ posรญbel escribir en %s"
@@ -1888,8 +1912,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Non รฉ posรญbel abrir o ficheiro de base de datos %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Non foi posรญbel determinar o estado %s"
@@ -1902,87 +1926,87 @@ msgstr "O arquivo non ten un rexistro de control"
 msgid "Unable to get a cursor"
 msgstr "Non รฉ posรญbel obter un cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: non รฉ posรญbel ler o directorio %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: non รฉ posรญbel atopar %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: os erros aplรญcanse ao ficheiro "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Non foi posรญbel solucionar %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Fallou o percorrido da รกrbore"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Non foi posรญbel abrir %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DesLig %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Non foi posรญbel ler a ligazรณn %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Non foi posรญbel desligar %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Non foi posรญbel ligar %s con %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Acadouse o lรญmite de desligado de %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "O arquivo non tiรฑa un campo Package"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ten unha entrada de ยซoverrideยป\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  O mantedor de %s รฉ %s, non %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ten unha entrada de ยซoverrideยป de cรณdigo fonte\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampouco ten unha entrada de ยซoverrideยป de binarios\n"
@@ -2056,7 +2080,7 @@ msgstr "Non foi posรญbel ler ao calcular o MD5"
 msgid "Problem unlinking %s"
 msgstr "Xurdiu un problema ao desligar %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Non foi posรญbel cambiar o nome de %s a %s"
@@ -2116,23 +2140,23 @@ msgstr ""
 "  -o=? Estabelece unha opciรณn de configuraciรณn; por exemplo, -o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Non foi posรญbel crear as canles"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Non foi posรญbel executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Arquivo danado"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "A suma de comprobaciรณn do arquivo tar non coincide, estรก danado"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeceira TAR %u descoรฑecido, membro %s"
@@ -2203,54 +2227,54 @@ msgstr "Non foi posรญbel escribir no ficheiro ยซ%sยป"
 msgid "Failed to close file %s"
 msgstr "Non foi posรญbel pechar o ficheiro %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "A ruta %s รฉ longa de mรกis"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s mรกis dunha vez"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O directorio %s estรก desviado"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "O paquete tenta escribir no destino do desvรญo %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "A ruta do desvรญo รฉ longa de mรกis"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "O directorio %s estase a substituรญr por algo que non รฉ un directorio"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Non foi posรญbel atopar o nodo no seu contedor hash"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "A ruta รฉ longa de mรกis"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Coincidencia na sobrescritura sen versiรณn para %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Non รฉ posรญbel determinar o estado %s"
@@ -2333,30 +2357,30 @@ msgstr ""
 "desactivado polo usuario."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selecciรณn %s"
@@ -2430,6 +2454,16 @@ msgstr "%c%s... Erro!"
 msgid "%c%s... Done"
 msgstr "%c%s... Feito"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Feito"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2491,43 +2525,43 @@ msgstr "Non foi posรญbel analizar o CD-ROM"
 msgid "Problem closing the gzip file %s"
 msgstr "Produciuse un problema ao pechar o arquivo gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de sรณ lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Non foi posรญbel abrir o ficheiro de bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Non foi posรญbel obter o bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "A lista de ficheiros non pode ser creada como ยซ%sยป non รฉ un directorio"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignorando ยซ%sยป no directorio ยซ%sยป xa que non รฉ un ficheiro regular"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Ignorando o ficheiro ยซ%sยป no directorio ยซ%sยป xa que non ten extensiรณn de nome"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2535,73 +2569,79 @@ msgstr ""
 "Ignorando o ficheiro ยซ%sยป no directorio ยซ%sยป xa que ten  unha extensiรณn de "
 "nome incorrecta"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O subproceso %s recibiu o sinal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O subproceso %s devolveu un cรณdigo de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O subproceso %s saรญu de xeito inesperado"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Non foi posรญbel abrir o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Non foi posรญbel abrir o descritor de ficheiro %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Non foi posรญbel crear o IPC do subproceso"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Non foi posรญbel executar o compresor "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lectura, aรญnda hai %lu para ler pero non queda ningรบn"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritura, aรญnda hai %lu para escribir pero non se puido"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Produciuse un problema ao pechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Produciuse un problema ao renomear o ficheiro %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Produciuse un problema ao desligar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Produciuse un problema ao sincronizar o ficheiro"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Non ha ningรบn chaveiro instalado en %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cachรฉ de paquetes baleira"
@@ -2628,59 +2668,59 @@ msgstr "Este APT non admite o sistema de versionado ยซ%sยป"
 msgid "The package cache was built for a different architecture"
 msgstr "A cachรฉ de paquetes construรญuse para unha arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Suxire"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Substitรบe a"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Fai obsoleto a"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Mellora"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "requirido"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "estรกndar"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2784,17 +2824,17 @@ msgstr "Abrindo %s"
 msgid "Line %u too long in source list %s."
 msgstr "Liรฑa %u longa de mรกis na lista de orixes %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Liรฑa %u mal construรญda na lista de orixes %s (tipo)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "O tipo ยซ%sยป non se coรฑece na liรฑa %u da lista de orixes %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2803,12 +2843,12 @@ msgstr ""
 "Non foi posรญbel facer a configuraciรณn inmediata en ยซ%sยป. Vexa man 5 apt.conf "
 "baixo APT::Immediate-Configure para obter mรกis detalles. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Non foi posรญbel abrir o ficheiro ยซ%sยป"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2832,7 +2872,7 @@ msgstr ""
 "O paquete %s ten que ser reinstalado, mais non รฉ posรญbel atopar o seu "
 "arquivo."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2840,11 +2880,11 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve xerou interrupciรณns, isto pode estar "
 "causado por paquetes retidos."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non รฉ posรญbel solucionar os problemas, ten retidos paquetes rotos."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2853,7 +2893,7 @@ msgstr ""
 "Algรบns ficheiros de รญndice fallaron durante a descarga. Ignorรกronse, ou "
 "foron utilizados algรบns antigos no seu lugar"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Non se atopa a lista de directorios %sparcial."
@@ -2890,17 +2930,17 @@ msgstr "Non foi posรญbel atopar o controlador de mรฉtodos %s."
 msgid "Method %s did not start correctly"
 msgstr "O mรฉtodo %s non se iniciou correctamente"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Insira o disco etiquetado: ยซ%sยป na unidade ยซ%sยป e prema Intro."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "O sistema de empaquetado ยซ%sยป non estรก admitido"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Non รฉ posรญbel determinar un tipo de sistema de empaquetado axeitado"
 
@@ -2933,8 +2973,6 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
-"O valor ยซ%sยป non รฉ vรกlido para APT::Default-Release xa que esa versiรณn non "
-"estรก dispoรฑรญbel nas orixes"
 
 #: apt-pkg/policy.cc:399
 #, c-format
@@ -2959,14 +2997,14 @@ msgstr "A cachรฉ ten un sistema de versionado incompatรญbel"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Produciuse un erro ao procesar %s (FindPkg)"
@@ -2988,28 +3026,28 @@ msgstr "Vaites!, superou o nรบmero de descriciรณns que este APT pode manexar."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Vaites!, superou o nรบmero de dependencias que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Non foi posรญbel atopar o paquete %s %s ao procesar as dependencias de "
 "ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Non foi posรญbel atopar a lista de paquetes fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lendo as listas de paquetes"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Recollendo as provisiรณns de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Produciuse un erro de E/S ao gravar a cachรฉ de fontes"
 
@@ -3022,12 +3060,12 @@ msgstr "non foi posรญbel cambiar o nome, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "A MD5Sum non coincide"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "A sumas ยซhashยป non coinciden"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3036,34 +3074,32 @@ msgstr ""
 "Non รฉ posรญbel atopar a entrada agardada ยซ%sยป no ficheiro de publicaciรณn "
 "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 "Non รฉ posรญbel ler a suma de comprobaciรณn para ยซ%sยป no ficheiro de publicaciรณn"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Non hai unha chave pรบblica dispoรฑรญbel para os seguintes ID de chave:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"O ficheiro de publicaciรณn de %s caducou (non vรกlido desde %s). Non se "
-"aplicarรกn as actualizaciรณns deste repositorio."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflito na distribuciรณn: %s (agardรกbase %s mais obtรญvose %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Produciuse un erro durante a verificaciรณn da sinatura. O repositorio non foi "
@@ -3071,12 +3107,12 @@ msgstr ""
 "%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Produciuse un erro de GPG: %s %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,7 +3121,7 @@ msgstr ""
 "Non รฉ posรญbel atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man. (Falta a arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3094,7 +3130,7 @@ msgstr ""
 "Non รฉ posรญbel atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3102,31 +3138,31 @@ msgstr ""
 "Os ficheiros de รญndices de paquetes estรกn danados. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Os tamaรฑos non coinciden"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Non se puido analizar o ficheiro de publicaciรณn %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Non hai secciรณns no ficheiro de publicaciรณn %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Non hai entrada de Hash no ficheiro de publicaciรณn %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "A entrada ยซValid-Untilยป no ficheiro de publicaciรณn %s non รฉ vรกlida"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "A entrada ยซDateยป no ficheiro de publicaciรณn %s non รฉ vรกlida"
@@ -3154,7 +3190,7 @@ msgstr "Identificando... "
 msgid "Stored label: %s\n"
 msgstr "Etiqueta almacenada: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando o CD-ROM...\n"
 
@@ -3218,30 +3254,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copiando as listas de paquetes..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Escribindo a nova lista de orixes\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas da lista de orixes deste disco son:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escribรญronse %i rexistros.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Escribรญronse %i rexistros con %i ficheiros que faltan.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Escribรญronse %i rexistros con %i ficheiros que non coinciden\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3258,17 +3294,6 @@ msgstr "Non รฉ posรญbel atopar un rexistro de autenticaciรณn para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Valor de hash non coincidente para: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "O ficheiro %s non comeza cunha mensaxe de sinatura limpa"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Non ha ningรบn chaveiro instalado en %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3328,132 +3353,131 @@ msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr "Enviar escenario ao resolvedor"
+msgstr ""
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr "Enviar peticiรณn ao resolvedor"
+msgstr ""
 
 #: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
-msgstr "Preparar para recibir soluciรณn"
+msgstr ""
 
 #: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
 msgstr ""
-"produciuse un fallo no resolvedor externo sen unha mensaxe de erro axeitada"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
-msgstr "Executar o resolvedor externo"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Retirando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente retirado"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Tomando nota da desapariciรณn de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando o disparador de post-instalaciรณn %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directorio ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Non foi posรญbel abrir o ficheiro ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparandose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparรกndose para o retirado de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Retirouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparรกndose para retirar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Retirouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Non foi posรญbel escribir no rexistro, a chamada a openpty() fallou (/dev/pts "
 "non estaba montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Executando dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Non se escribiu ningรบn informe de Apport porque xa se acadou o nivel "
 "MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - dรฉixase sen configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3461,7 +3485,7 @@ msgstr ""
 "Non se escribiu ningรบn informe de Apport porque a mensaxe de erro indica que "
 "รฉ un error provinte dun fallo anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3477,15 +3501,7 @@ msgstr ""
 "Non se escribiu un informe de contribuciรณn porque a mensaxe de erro indica "
 "un erro de falta de memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Non hai un informe de ยซapportยป escrito, xa que a mensaxe de erro indica un "
-"problema no sistema local"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3521,22 +3537,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non estรก bloqueado"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Aconteceu algo malo, buscando ยซ%s:%sยป (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Feito"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Produciuse un erro durante a verificaciรณn da sinatura. O repositorio non "
-#~ "foi actualizado, empregaranse os ficheiros de รญndice anteriores. Erro de "
-#~ "GPG: %s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Omitindo o ficheiro inexistente %s"
 
diff --git a/po/he.po b/po/he.po
index d86267ed4..a2e3cba60 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,169 +6,163 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
-"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-10-15 09:49+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:158
+#: cmdline/apt-cache.cc:141
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "ืœื—ื‘ื™ืœื” %s ื‘ื’ืจืกื” %s ื™ืฉ ืชืœื•ื™ื•ืช ืฉืœื ื ืขื ื•:\n"
 
-#: cmdline/apt-cache.cc:286
-msgid "Total package names: "
-msgstr "Total package names: "
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "ืœื ืžืฆืœื™ื— ืœืืชืจ ืืช ื”ื—ื‘ื™ืœื” %s"
 
-#: cmdline/apt-cache.cc:288
-msgid "Total package structures: "
-msgstr "Total package structures: "
+#: cmdline/apt-cache.cc:245
+msgid "Total package names: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:285
 msgid "  Normal packages: "
 msgstr "ื—ื‘ื™ืœื•ืช ื ื•ืจืžืœื™ื•ืช:"
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:286
 msgid "  Pure virtual packages: "
 msgstr "ื—ื‘ื™ืœื•ืช ื•ื™ืจื˜ื•ืืœื™ื•ืช ืœื—ืœื•ื˜ื™ืŸ:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:287
 msgid "  Single virtual packages: "
-msgstr "  Single virtual packages: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:331
+#: cmdline/apt-cache.cc:288
 msgid "  Mixed virtual packages: "
-msgstr "  Mixed virtual packages: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:289
 msgid "  Missing: "
 msgstr "ื—ืกืจื•ืช:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
-msgstr "Total distinct versions: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct descriptions: "
-msgstr "Total distinct descriptions: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:338
+#: cmdline/apt-cache.cc:295
 msgid "Total dependencies: "
-msgstr "Total dependencies: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:298
 msgid "Total ver/file relations: "
-msgstr "Total ver/file relations: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:300
 msgid "Total Desc/File relations: "
-msgstr "Total Desc/File relations: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:345
+#: cmdline/apt-cache.cc:302
 msgid "Total Provides mappings: "
-msgstr "Total Provides mappings: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:357
+#: cmdline/apt-cache.cc:314
 msgid "Total globbed strings: "
-msgstr "Total globbed strings: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:371
+#: cmdline/apt-cache.cc:328
 msgid "Total dependency version space: "
-msgstr "Total dependency version space: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:333
 msgid "Total slack space: "
-msgstr "Total slack space: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:384
+#: cmdline/apt-cache.cc:341
 msgid "Total space accounted for: "
-msgstr "Total space accounted for: "
+msgstr ""
 
-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ืงื•ื‘ืฅ ื”ื—ื‘ื™ืœื” %s ืœื ืžืกื•ื ื›ืจืŸ."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: cmdline/apt-cache.cc:1297
+msgid "You must give exactly one pattern"
+msgstr "ืืชื” ื—ื™ื™ื‘ ืœืชืช ื‘ื“ื™ื•ืง ืชื‘ื ื™ืช ืื—ืช"
+
+#: cmdline/apt-cache.cc:1451
 msgid "No packages found"
 msgstr "ืœื ื ืžืฆืื• ื—ื‘ื™ืœื•ืช"
 
-#: cmdline/apt-cache.cc:1226
-msgid "You must give at least one search pattern"
-msgstr "You must give at least one search pattern"
-
-#: cmdline/apt-cache.cc:1361
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
-
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "ืœื ืžืฆืœื™ื— ืœืืชืจ ืืช ื”ื—ื‘ื™ืœื” %s"
-
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1528
 msgid "Package files:"
 msgstr "ืงื‘ืฆื™ ื—ื‘ื™ืœื”:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Cache is out of sync, can't x-ref a package file"
+msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
 msgstr "ื—ื‘ื™ืœื•ืช ื ืขื•ืฆื•ืช:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
 msgstr "(ืœื ื ืžืฆื)"
 
-#: cmdline/apt-cache.cc:1527
+#. Installed version
+#: cmdline/apt-cache.cc:1582
 msgid "  Installed: "
 msgstr "ืžื•ืชืงืŸ:"
 
-#: cmdline/apt-cache.cc:1528
-msgid "  Candidate: "
-msgstr "ืžื•ืขืžื“ื™ื:"
-
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 msgid "(none)"
 msgstr "(none)"
 
-#: cmdline/apt-cache.cc:1561
+#. Candidate Version
+#: cmdline/apt-cache.cc:1589
+msgid "  Candidate: "
+msgstr "ืžื•ืขืžื“ื™ื:"
+
+#: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
 msgstr "ื ืขืฅ ื—ื‘ื™ืœื”:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1608
 msgid "  Version table:"
-msgstr "  Version table:"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
-#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ื‘ืฉื‘ื™ืœ %s %s ืงื•ืžืคืœ ืขืœ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1725
 msgid ""
 "Usage: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
 "\n"
 "Commands:\n"
+"   add - Add a package file to the source cache\n"
 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"
@@ -196,28 +190,23 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:79
+#: cmdline/apt-cdrom.cc:77
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+msgstr ""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Please insert a Disc in the drive and press enter"
-
-#: cmdline/apt-cdrom.cc:129
-#, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr "Failed to mount '%s' to '%s'"
+msgstr ""
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:114
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Repeat this process for the rest of the CDs in your set."
+msgstr ""
 
-#: cmdline/apt-config.cc:46
+#: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
-msgstr "Arguments not in pairs"
+msgstr ""
 
-#: cmdline/apt-config.cc:87
+#: cmdline/apt-config.cc:76
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -232,96 +221,398 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s ื”ื•ื ืœื ื—ื‘ื™ืœืช DEB ืชืงื™ื ื”."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
 "\n"
 "Options:\n"
-"  -h   This help text.\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:135
-msgid "Y"
-msgstr "Y"
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ืœื ืžืฆืœื™ื— ืœื›ืชื•ื‘ ืœ-%s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "ืœื ืžืฆืœื™ื— ืœืงื‘ืœ ืืช ื’ืจืกืช debconf. ื”ืื debconf ืžื•ืชืงืŸ?"
+
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+msgid "Package extension list is too long"
+msgstr ""
 
-#: cmdline/apt-get.cc:140
-msgid "N"
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#, c-format
+msgid "Error processing directory %s"
+msgstr "ืฉื’ื™ืื” ื‘ืขื™ื‘ื•ื“ ืกืคืจื™ื” %s"
+
+#: ftparchive/apt-ftparchive.cc:251
+msgid "Source extension list is too long"
 msgstr ""
 
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: ftparchive/apt-ftparchive.cc:368
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:398
+#, c-format
+msgid "Error processing contents %s"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:553
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:759
+msgid "No selections matched"
+msgstr "ืื™ืŸ ื”ืชืืžื•ืช"
+
+#: ftparchive/apt-ftparchive.cc:832
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ื—ืœืง ืžื”ืงื‘ืฆื™ื ื—ืกืจื™ื ื‘ืงื‘ื•ืฆืช ืงื‘ืฆื™ ื”ื—ื‘ื™ืœื” `%s'"
+
+#: ftparchive/cachedb.cc:43
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "ืžืกื“ ื”ื ืชื•ื ื™ื ืื™ื ื• ืชืงื™ืŸ, ื”ืงื•ื‘ืฅ ื”ื•ืขื‘ืจ ืœ-%s.old"
+
+#: ftparchive/cachedb.cc:61
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "ืžืกื“ ื”ื ืชื•ื ื™ื ื™ืฉืŸ, ืžื ืกื” ืœืฉื“ืจื’ ืœ-%s"
+
+#: ftparchive/cachedb.cc:72
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:77
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "ืœื ืžืฆืœื™ื— ืœืคืชื•ื— ืืช ืงื•ื‘ืฅ ืžืกื“ ื”ื ืชื•ื ื™ื %s: %s"
+
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#, c-format
+msgid "Failed to stat %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc:238
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:444
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:76
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: ืœื ืžืฆืœื™ื— ืœืงืจื•ื ืืช ื”ืกืคืจื™ื” %s\n"
+
+#: ftparchive/writer.cc:81
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr ""
+
+#: ftparchive/writer.cc:132
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:134
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:141
+msgid "E: Errors apply to file "
+msgstr "E: ืฉื’ื™ืื•ืช ืชืงืคื•ืช ืœืงื•ื‘ืฅ"
+
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "ื›ืฉืœื•ืŸ ื‘ืคืขื ื•ื— %s"
+
+#: ftparchive/writer.cc:170
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:195
+#, c-format
+msgid "Failed to open %s"
+msgstr "ื›ืฉืœื•ืŸ ื‘ืคืชื™ื—ืช %s"
+
+#: ftparchive/writer.cc:254
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr ""
+
+#: ftparchive/writer.cc:262
+#, c-format
+msgid "Failed to readlink %s"
+msgstr ""
+
+#: ftparchive/writer.cc:266
+#, c-format
+msgid "Failed to unlink %s"
+msgstr ""
+
+#: ftparchive/writer.cc:273
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** ื›ืฉืœื•ืŸ ื‘ืงื™ืฉื•ืจ %s ืœ-%s"
+
+#: ftparchive/writer.cc:283
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
+
+#: ftparchive/writer.cc:388
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "ื”ืžืชื—ื–ืง ืฉืœ %s ื”ื•ื %s ื•ืœื %s\n"
+
+#: ftparchive/writer.cc:637
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:641
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+
+#: ftparchive/contents.cc:321
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr ""
+
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - ื›ืฉืœื•ืŸ ื‘ื”ืงืฆืืช ื–ื™ื›ืจื•ืŸ"
+
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "ืœื ืžืฆืœื™ื— ืœืคืชื•ื— ืืช %s"
+
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr ""
+
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr ""
+
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr ""
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:72
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' ืืœื’ื•ืจื™ืชื ื“ื—ื™ื” ืœื ื™ื“ื•ืข"
+
+#: ftparchive/multicompress.cc:102
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr ""
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to create FILE*"
+msgstr ""
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to fork"
+msgstr "ื›ืฉืœื•ืŸ ื‘ื‘ื™ืฆื•ืข fork"
+
+#: ftparchive/multicompress.cc:212
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:235
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "ืฉื’ื™ืื” ืคื ื™ืžื™ืช, ื›ืœืฉื•ืŸ ื‘ื™ืฆื™ืจืช %s"
+
+#: ftparchive/multicompress.cc:286
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: ftparchive/multicompress.cc:321
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: ftparchive/multicompress.cc:360
+msgid "decompressor"
+msgstr ""
+
+#: ftparchive/multicompress.cc:403
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:455
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:472
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "ื›ืฉืœื•ืŸ ื‘ืฉื™ื ื•ื™ ื”ืฉื %s ืœ-%s"
+
+#: cmdline/apt-get.cc:127
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "Regex compilation error - %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:260
+#: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
 msgstr "ืœื—ื‘ื™ืœื•ืช ื”ื‘ืื•ืช ื™ืฉ ืชืœื•ื™ื•ืช ืฉืœื ื ืขื ื•:"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
 msgstr "ืื‘ืœ %s ืžื•ืชืงื ืช"
 
-#: cmdline/apt-get.cc:352
+#: cmdline/apt-get.cc:336
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ืื‘ืœ %s ื”ื•ืœื›ืช ืœื”ื™ื•ืช ืžื•ืชืงื ืช"
 
-#: cmdline/apt-get.cc:359
+#: cmdline/apt-get.cc:343
 msgid "but it is not installable"
 msgstr "ืื‘ืœ ื”ื™ื ืื™ื ื” ื ื™ืชื ืช ืœื”ืชืงื ื”"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
 msgstr "ืื‘ืœ ื”ื™ื ื—ื‘ื™ืœื” ื•ื™ืจื˜ื•ืืœื™ืช"
 
-#: cmdline/apt-get.cc:364
+#: cmdline/apt-get.cc:348
 msgid "but it is not installed"
 msgstr "ืื‘ืœ ื”ื™ื ืœื ืžื•ืชืงื ืช"
 
-#: cmdline/apt-get.cc:364
+#: cmdline/apt-get.cc:348
 msgid "but it is not going to be installed"
 msgstr "ืื‘ืœ ื”ื™ื ืื™ื ื” ื”ื•ืœื›ืช ืœื”ื™ื•ืช ืžื•ืชืงื ืช"
 
-#: cmdline/apt-get.cc:369
+#: cmdline/apt-get.cc:353
 msgid " or"
 msgstr "ืื•"
 
-#: cmdline/apt-get.cc:398
+#: cmdline/apt-get.cc:382
 msgid "The following NEW packages will be installed:"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื—ื“ืฉื•ืช ื”ื‘ืื•ืช ื”ื•ืœื›ื•ืช ืœื”ื™ื•ืช ืžื•ืชืงื ื•ืช:"
 
-#: cmdline/apt-get.cc:424
+#: cmdline/apt-get.cc:408
 msgid "The following packages will be REMOVED:"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื‘ืื•ืช ื™ื•ืกืจื•:"
 
-#: cmdline/apt-get.cc:446
+#: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื‘ืื•ืช ืžืขื•ื‘ื•ืช:"
 
-#: cmdline/apt-get.cc:467
+#: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื‘ืื•ืช ื™ืฉื•ื“ืจื’ื•:"
 
-#: cmdline/apt-get.cc:488
+#: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื‘ืื•ืช ื™ืฉื•ื“ืจื’ื• ืžื˜ื”:"
 
-#: cmdline/apt-get.cc:508
+#: cmdline/apt-get.cc:492
 msgid "The following held packages will be changed:"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ืžื—ื•ื–ืงื•ืช ื”ื‘ืื•ืช ื™ืฉื•ื ื•:"
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:545
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ื‘ื’ืœืœ %s) "
 
-#: cmdline/apt-get.cc:571
+#: cmdline/apt-get.cc:553
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -330,348 +621,311 @@ msgstr ""
 "ื ื– ื” ืจ ื”: ื”ื—ื‘ื™ืœื•ืช ื”ื—ื™ื•ื ื™ื•ืช ื”ื‘ืื•ืช ื™ื•ืกืจื•\n"
 "ืขืœ ื”ืคืขื•ืœื” ืœื”ืขืฉื•ืช *ืจืง* ืื ืืชื” ื™ื•ื“ืข ืžื” ืืชื” ืขื•ืฉื”!"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu ืžืฉื•ื“ืจื’ื™ื, %lu ืžื•ืชืงื ื™ื ื—ื“ืฉื™ื, "
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ืžื•ืชืงื ื•ืช ืžื—ื“ืฉ, "
 
-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ืžืฉื•ื“ืจื’ื•ืช ืžื˜ื”, "
 
-#: cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ื™ื•ืกืจื• ื•-%lu ืœื ื™ืฉื•ื“ืจื’ื•.\n"
 
-#: cmdline/apt-get.cc:614
+#: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ืœื ืžื•ืชืงื ื•ืช ืœื—ืœื•ื˜ื™ืŸ ืื• ื”ื•ืกืจื•.\n"
 
-#: cmdline/apt-get.cc:635
-#, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Note, selecting '%s' for task '%s'\n"
-
-#: cmdline/apt-get.cc:640
-#, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Note, selecting '%s' for regex '%s'\n"
-
-#: cmdline/apt-get.cc:657
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Package %s is a virtual package provided by:\n"
-
-#: cmdline/apt-get.cc:668
-msgid " [Installed]"
-msgstr " [Installed]"
-
-#: cmdline/apt-get.cc:677
-msgid " [Not candidate version]"
-msgstr " [Not candidate version]"
-
-#: cmdline/apt-get.cc:679
-msgid "You should explicitly select one to install."
-msgstr "You should explicitly select one to install."
-
-#: cmdline/apt-get.cc:682
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-
-#: cmdline/apt-get.cc:700
-msgid "However the following packages replace it:"
-msgstr "However the following packages replace it:"
-
-#: cmdline/apt-get.cc:712
-#, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr "Package '%s' has no installation candidate"
-
-#: cmdline/apt-get.cc:725
-#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtual packages like '%s' can't be removed\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:788
-#, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Note, selecting '%s' instead of '%s'\n"
-
-#: cmdline/apt-get.cc:818
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-
-#: cmdline/apt-get.cc:822
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Skipping %s, it is not installed and only upgrades are requested.\n"
-
-#: cmdline/apt-get.cc:834
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-
-#: cmdline/apt-get.cc:839
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s is already the newest version.\n"
-
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ืื‘ืœ %s ื”ื•ืœื›ืช ืœื”ื™ื•ืช ืžื•ืชืงื ืช"
-
-#: cmdline/apt-get.cc:884
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Selected version '%s' (%s) for '%s'\n"
-
-#: cmdline/apt-get.cc:889
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:669
 msgid "Correcting dependencies..."
 msgstr "ืžืชืงืŸ ืชืœื•ื™ื•ืช..."
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:672
 msgid " failed."
 msgstr "ื›ืฉืœื•ืŸ."
 
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:675
 msgid "Unable to correct dependencies"
 msgstr "ืœื ืžืฆืœื™ื— ืœืชืงืŸ ืชืœื•ื™ื•ืช"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:678
 msgid "Unable to minimize the upgrade set"
 msgstr "ื ื– ื” ืจ ื”: ื”ื—ื‘ื™ืœื•ืช ื”ื—ื™ื•ื ื™ื•ืช ื”ื‘ืื•ืช ื™ื•ืกืจื•"
 
-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:680
 msgid " Done"
 msgstr "ืกื™ื•ื"
 
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:684
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "ืื•ืœื™ ืชืจืฆื” ืœื”ืจื™ืฅ 'apt-get -f install' ื›ื“ื™ ืœืชืงืŸ ืืช ืืœื•."
 
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:687
 msgid "Unmet dependencies. Try using -f."
 msgstr "ืชืœื•ื™ื•ืช ืฉืœื ื ืขื ื•. ื ืกื” ืœื”ืฉืชืžืฉ ื‘ืืคืฉืจื•ืช -f."
 
-#: cmdline/apt-get.cc:1068
+#: cmdline/apt-get.cc:712
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื‘ืื•ืช ื™ืฉื•ื“ืจื’ื•:"
 
-#: cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:716
 msgid "Authentication warning overridden.\n"
-msgstr "Authentication warning overridden.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:723
 msgid "Install these packages without verification [y/N]? "
-msgstr "Install these packages without verification [y/N]? "
+msgstr ""
 
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:725
 msgid "Some packages could not be authenticated"
-msgstr "Some packages could not be authenticated"
+msgstr ""
 
-#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "ื”ื™ื• ื‘ืขื™ื•ืช ื•ื”ืืคืฉืจื•ืช -y ื”ื™ืชื” ื‘ืฉื™ืžื•ืฉ ืœืœื ื”ืืคืฉืจื•ืช --force-yes"
 
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:775
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
 
-#: cmdline/apt-get.cc:1140
+#: cmdline/apt-get.cc:784
 msgid "Packages need to be removed but remove is disabled."
-msgstr "Packages need to be removed but remove is disabled."
+msgstr ""
 
-#: cmdline/apt-get.cc:1151
+#: cmdline/apt-get.cc:795
 msgid "Internal error, Ordering didn't finish"
-msgstr "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
+msgid "Unable to lock the download directory"
+msgstr "ืœื ืžืฆืœื™ื— ืœื ืขื•ืœ ืืช ืกืคืจื™ืช ื”ื”ื•ืจื“ื”."
 
-#: cmdline/apt-get.cc:1189
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: apt-pkg/cachefile.cc:65
+msgid "The list of sources could not be read."
+msgstr "ืจืฉื™ืžืช ื”ืžืงื•ืจื•ืช ืœื ื ื™ืชื ืช ืœืงืจื™ืื”."
+
+#: cmdline/apt-get.cc:836
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1196
+#: cmdline/apt-get.cc:841
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ืฆืจื™ืš ืœืงื‘ืœ %sB/%sB ืžืชื•ืš ื”ืืจื›ื™ื•ื ื™ื.\n"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:844
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ืฆืจื™ืš ืœืงื‘ืœ %sB ืžืชื•ืš ื”ืืจื›ื™ื•ื ื™ื.\n"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:849
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "ืื—ืจื™ ืคืจื™ืกื” %sB ื ื•ืกืคื™ื ื™ื”ื™ื• ื‘ืฉื™ืžื•ืฉ.\n"
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1213
+#: cmdline/apt-get.cc:852
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ืื—ืจื™ ืคืจื™ืกื” %sB ื ื•ืกืคื™ื ื™ืฉื•ื—ืจืจื•.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ืื™ืŸ ืœืš ืžืกืคื™ืง ืžืงื•ื ืคื ื•ื™ ื‘-%s."
 
-#: cmdline/apt-get.cc:1241
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ืื™ืŸ ืœืš ืžืกืคื™ืง ืžืงื•ื ืคื ื•ื™ ื‘-%s."
 
-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Trivial Only specified but this is not a trivial operation."
+msgstr ""
 
-#: cmdline/apt-get.cc:1259
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "ื›ืŸ, ืขืฉื” ื›ืคื™ ืฉืื ื™ ืื•ืžืจ!"
 
-#: cmdline/apt-get.cc:1261
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
 
-#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "ื‘ื˜ืœ."
 
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:921
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "ื”ืื ืืชื” ืจื•ืฆื” ืœื”ืžืฉื™ืš? [Y/n]"
 
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ื›ืฉืœื•ืŸ ื‘ื”ื‘ืืช %s  %s\n"
 
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "ื›ืฉืœื•ืŸ ื‘ื”ื•ืจื“ืช ื—ืœืง ืžื”ืงื‘ืฆื™ื"
 
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
 msgid "Download complete and in download only mode"
 msgstr "ื”ื”ื•ืจื“ื” ื”ืกืชื™ื™ืžื” ื‘ืžืกื’ืจืช ืžืฆื‘ ื”ื•ืจื“ื” ื‘ืœื‘ื“."
 
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
 
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing and media swapping is not currently supported"
+msgstr ""
 
-#: cmdline/apt-get.cc:1388
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
-msgstr "Unable to correct missing packages."
+msgstr ""
 
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
-msgstr "Aborting install."
+msgstr ""
+
+#: cmdline/apt-get.cc:1086
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1097
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1115
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1126
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1138
+msgid " [Installed]"
+msgstr ""
+
+#: cmdline/apt-get.cc:1143
+msgid "You should explicitly select one to install."
+msgstr ""
+
+#: cmdline/apt-get.cc:1148
+#, c-format
 msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[1] ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:1421
-msgid "Note: This is done automatically and on purpose by dpkg."
+#: cmdline/apt-get.cc:1167
+msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1170
 #, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Ignore unavailable target release '%s' of package '%s'"
+msgid "Package %s has no installation candidate"
+msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1190
 #, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Picking '%s' as source package instead of '%s'\n"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1198
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1227
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr ""
+
+#: cmdline/apt-get.cc:1229
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr ""
+
+#: cmdline/apt-get.cc:1235
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1313
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
 
-#: cmdline/apt-get.cc:1645
+#: cmdline/apt-get.cc:1342
+#, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1395
 msgid "The update command takes no arguments"
-msgstr "The update command takes no arguments"
+msgstr ""
+
+#: cmdline/apt-get.cc:1408
+msgid "Unable to lock the list directory"
+msgstr ""
 
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1464
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
 
-#: cmdline/apt-get.cc:1815
+#: cmdline/apt-get.cc:1513
+#, fuzzy
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื—ื“ืฉื•ืช ื”ื‘ืื•ืช ื”ื•ืœื›ื•ืช ืœื”ื™ื•ืช ืžื•ืชืงื ื•ืช:"
+
+#: cmdline/apt-get.cc:1515
+#, fuzzy, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื—ื“ืฉื•ืช ื”ื‘ืื•ืช ื”ื•ืœื›ื•ืช ืœื”ื™ื•ืช ืžื•ืชืงื ื•ืช:"
+
+#: cmdline/apt-get.cc:1516
+msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
+
+#: cmdline/apt-get.cc:1521
+msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
+msgstr ""
 
 #.
 #. if (Packages == 1)
@@ -683,298 +937,204 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
 msgid "The following information may help to resolve the situation:"
-msgstr "The following information may help to resolve the situation:"
+msgstr ""
 
-#: cmdline/apt-get.cc:1822
+#: cmdline/apt-get.cc:1528
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ืฉื’ื™ืื” ืคื ื™ืžื™ืช, ื›ืœืฉื•ืŸ ื‘ื™ืฆื™ืจืช %s"
 
-#: cmdline/apt-get.cc:1829
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"The following package was automatically installed and is no longer required:"
-msgstr[1] ""
-"The following packages were automatically installed and are no longer "
-"required:"
+#: cmdline/apt-get.cc:1547
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr ""
 
-#: cmdline/apt-get.cc:1833
+#: cmdline/apt-get.cc:1602
 #, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-"%lu package was automatically installed and is no longer required.\n"
-msgstr[1] ""
-"%lu packages were automatically installed and are no longer required.\n"
+msgid "Couldn't find task %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:1835
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#, c-format
+msgid "Couldn't find package %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:1854
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Internal error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1740
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1771
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ืื‘ืœ %s ื”ื•ืœื›ืช ืœื”ื™ื•ืช ืžื•ืชืงื ืช"
 
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1784
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
 
-#: cmdline/apt-get.cc:1972
+#: cmdline/apt-get.cc:1799
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1817
 msgid "Broken packages"
-msgstr "Broken packages"
+msgstr ""
 
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:1846
 msgid "The following extra packages will be installed:"
-msgstr "The following extra packages will be installed:"
+msgstr ""
 
-#: cmdline/apt-get.cc:2109
+#: cmdline/apt-get.cc:1935
 msgid "Suggested packages:"
-msgstr "Suggested packages:"
+msgstr ""
 
-#: cmdline/apt-get.cc:2110
+#: cmdline/apt-get.cc:1936
 msgid "Recommended packages:"
-msgstr "Recommended packages:"
-
-#: cmdline/apt-get.cc:2152
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Couldn't find package %s"
-
-#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "%s set to automatically installed.\n"
-
-#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
-msgid ""
-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2183
+#: cmdline/apt-get.cc:1965
 msgid "Calculating upgrade... "
-msgstr "Calculating upgrade... "
+msgstr ""
 
-#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
 msgid "Failed"
-msgstr "Failed"
+msgstr ""
 
-#: cmdline/apt-get.cc:2191
+#: cmdline/apt-get.cc:1973
 msgid "Done"
-msgstr "Done"
+msgstr ""
 
-#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ืฉื’ื™ืื” ืคื ื™ืžื™ืช, ื›ืœืฉื•ืŸ ื‘ื™ืฆื™ืจืช %s"
 
-#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
-msgid "Unable to lock the download directory"
-msgstr "ืœื ืžืฆืœื™ื— ืœื ืขื•ืœ ืืช ืกืคืจื™ืช ื”ื”ื•ืจื“ื”."
-
-#: cmdline/apt-get.cc:2386
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2391
-#, c-format
-msgid "Downloading %s %s"
-msgstr "Downloading %s %s"
-
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2148
 msgid "Must specify at least one package to fetch source for"
-msgstr "Must specify at least one package to fetch source for"
-
-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Unable to find a source package for %s"
-
-#: cmdline/apt-get.cc:2508
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
 msgstr ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
 #, c-format
-msgid ""
-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2227
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Skipping already downloaded file '%s'\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2262
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "You don't have enough free space in %s"
+msgstr ""
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2612
+#: cmdline/apt-get.cc:2268
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Need to get %sB/%sB of source archives.\n"
+msgstr ""
 
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2271
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Need to get %sB of source archives.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2623
+#: cmdline/apt-get.cc:2277
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Fetch source %s\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2308
 msgid "Failed to fetch some archives."
-msgstr "Failed to fetch some archives."
+msgstr ""
 
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "Unpack command '%s' failed.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2349
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2366
 #, c-format
 msgid "Build command '%s' failed.\n"
-msgstr "Build command '%s' failed.\n"
+msgstr ""
 
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2385
 msgid "Child process failed"
-msgstr "Child process failed"
+msgstr ""
 
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2401
 msgid "Must specify at least one package to check builddeps for"
-msgstr "Must specify at least one package to check builddeps for"
-
-#: cmdline/apt-get.cc:2791
-#, c-format
-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2429
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "Unable to get build-dependency information for %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2449
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s has no build depends.\n"
-
-#: cmdline/apt-get.cc:3008
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:3026
+#: cmdline/apt-get.cc:2501
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
 
-#: cmdline/apt-get.cc:3049
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-
-#: cmdline/apt-get.cc:3088
+#: cmdline/apt-get.cc:2554
 #, c-format
 msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:3094
+#: cmdline/apt-get.cc:2590
 #, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:3117
+#: cmdline/apt-get.cc:2617
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:3133
+#: cmdline/apt-get.cc:2633
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Build-dependencies for %s could not be satisfied."
+msgstr ""
 
-#: cmdline/apt-get.cc:3138
+#: cmdline/apt-get.cc:2638
 msgid "Failed to process build dependencies"
-msgstr "Failed to process build dependencies"
-
-#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
-msgid "Changelog for %s (%s)"
-msgstr "Changelog for %s (%s)"
+msgstr ""
 
-#: cmdline/apt-get.cc:3366
+#: cmdline/apt-get.cc:2670
 msgid "Supported modules:"
-msgstr "Supported modules:"
+msgstr ""
 
-#: cmdline/apt-get.cc:3407
+#: cmdline/apt-get.cc:2711
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -998,8 +1158,6 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1020,2326 +1178,1649 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3572
+#: cmdline/apt-get.cc:2879
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
 
-#: cmdline/acqprogress.cc:60
+#: cmdline/acqprogress.cc:55
 msgid "Hit "
-msgstr "Hit "
+msgstr ""
 
-#: cmdline/acqprogress.cc:84
+#: cmdline/acqprogress.cc:79
 msgid "Get:"
-msgstr "Get:"
+msgstr ""
 
-#: cmdline/acqprogress.cc:115
+#: cmdline/acqprogress.cc:110
 msgid "Ign "
-msgstr "Ign "
+msgstr ""
 
-#: cmdline/acqprogress.cc:119
+#: cmdline/acqprogress.cc:114
 msgid "Err "
-msgstr "Err "
+msgstr ""
 
-#: cmdline/acqprogress.cc:140
+#: cmdline/acqprogress.cc:135
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#: cmdline/acqprogress.cc:230
+#: cmdline/acqprogress.cc:225
 #, c-format
 msgid " [Working]"
-msgstr " [Working]"
+msgstr ""
 
-#: cmdline/acqprogress.cc:286
+#: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
 
-#: cmdline/apt-mark.cc:55
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr ""
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr ""
+
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""
+
+#: dselect/install:101
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr ""
+
+#: dselect/install:102
+msgid "will be configured. This may result in duplicate errors"
+msgstr ""
+
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:114
+msgid "Failed to create pipes"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:141
+msgid "Failed to exec gzip "
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+msgid "Corrupted archive"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:193
+msgid "Tar checksum failed, archive corrupted"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:296
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:70
+msgid "Invalid archive signature"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:78
+msgid "Error reading archive member header"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:90
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:102
+msgid "Invalid archive member header"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:128
+msgid "Archive is too short"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Failed to read the archive headers"
+msgstr ""
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr ""
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr ""
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "%s can not be marked as it is not installed.\n"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: cmdline/apt-mark.cc:61
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "%s was already set to manually installed.\n"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: cmdline/apt-mark.cc:63
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "%s was already set to automatically installed.\n"
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: cmdline/apt-mark.cc:228
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "ื›ืฉืœื•ืŸ ื‘ืคืขื ื•ื— %s"
+
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
 #, c-format
-msgid "%s was already set on hold.\n"
+msgid "Failed to close file %s"
 msgstr ""
 
-#: cmdline/apt-mark.cc:230
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
 #, c-format
-msgid "%s was already not hold.\n"
+msgid "The path %s is too long"
 msgstr ""
 
-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-inst/extract.cc:124
 #, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Waited for %s but it wasn't there"
+msgid "Unpacking %s more than once"
+msgstr ""
+
+#: apt-inst/extract.cc:134
+#, c-format
+msgid "The directory %s is diverted"
+msgstr ""
+
+#: apt-inst/extract.cc:144
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr ""
+
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+msgid "The diversion path is too long"
+msgstr ""
+
+#: apt-inst/extract.cc:240
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr ""
+
+#: apt-inst/extract.cc:280
+msgid "Failed to locate node in its hash bucket"
+msgstr ""
+
+#: apt-inst/extract.cc:284
+msgid "The path is too long"
+msgstr ""
+
+#: apt-inst/extract.cc:414
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr ""
+
+#: apt-inst/extract.cc:431
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr ""
+
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#, c-format
+msgid "Unable to read %s"
+msgstr ""
+
+#: apt-inst/extract.cc:491
+#, c-format
+msgid "Unable to stat %s"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#, c-format
+msgid "Failed to remove %s"
+msgstr ""
 
-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format
-msgid "%s set on hold.\n"
+msgid "Unable to create %s"
 msgstr ""
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#: apt-inst/deb/dpkgdb.cc:114
 #, c-format
-msgid "Canceled hold on %s.\n"
+msgid "Failed to stat %sinfo"
 msgstr ""
 
-#: cmdline/apt-mark.cc:332
-msgid "Executing dpkg failed. Are you root?"
+#: apt-inst/deb/dpkgdb.cc:119
+msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#: cmdline/apt-mark.cc:379
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:176
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
+msgid "Internal error getting a package name"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+msgid "Reading file listing"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:212
+#, c-format
 msgid ""
-"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-"\n"
-"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:262
+msgid "Internal error getting a node"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:305
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:320
+msgid "The diversion file is corrupted"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:358
+msgid "Internal error adding a diversion"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:379
+msgid "The pkg cache must be initialized first"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:439
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:461
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr ""
+
+#: apt-inst/deb/dpkgdb.cc:466
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:50
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:110
+#, c-format
+msgid "Couldn't change to %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:140
+msgid "Internal error, could not locate member"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:173
+msgid "Failed to locate a valid control file"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:258
+msgid "Unparsable control file"
 msgstr ""
 
-#: methods/cdrom.cc:203
+#: methods/cdrom.cc:200
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "Unable to read the cdrom database %s"
+msgstr ""
 
-#: methods/cdrom.cc:212
+#: methods/cdrom.cc:209
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
 
-#: methods/cdrom.cc:222
+#: methods/cdrom.cc:219
 msgid "Wrong CD-ROM"
-msgstr "Wrong CD-ROM"
+msgstr ""
 
-#: methods/cdrom.cc:249
+#: methods/cdrom.cc:245
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
 
-#: methods/cdrom.cc:254
+#: methods/cdrom.cc:250
 #, fuzzy
 msgid "Disk not found."
 msgstr "(ืœื ื ืžืฆื)"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
-msgstr "File not found"
+msgstr ""
 
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
-msgstr "Failed to stat"
+msgstr ""
 
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
 msgid "Failed to set modification time"
-msgstr "Failed to set modification time"
+msgstr ""
 
-#: methods/file.cc:47
+#: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "Invalid URI, local URIS must not start with //"
+msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:173
+#: methods/ftp.cc:168
 msgid "Logging in"
-msgstr "Logging in"
+msgstr ""
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:174
 msgid "Unable to determine the peer name"
-msgstr "Unable to determine the peer name"
+msgstr ""
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:179
 msgid "Unable to determine the local name"
-msgstr "Unable to determine the local name"
+msgstr ""
 
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:210 methods/ftp.cc:238
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "The server refused the connection and said: %s"
+msgstr ""
 
-#: methods/ftp.cc:221
+#: methods/ftp.cc:216
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "USER failed, server said: %s"
+msgstr ""
 
-#: methods/ftp.cc:228
+#: methods/ftp.cc:223
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "PASS failed, server said: %s"
+msgstr ""
 
-#: methods/ftp.cc:248
+#: methods/ftp.cc:243
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
 
-#: methods/ftp.cc:276
+#: methods/ftp.cc:271
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "Login script command '%s' failed, server said: %s"
+msgstr ""
 
-#: methods/ftp.cc:302
+#: methods/ftp.cc:297
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "TYPE failed, server said: %s"
+msgstr ""
 
-#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
-msgstr "Connection timeout"
+msgstr ""
 
-#: methods/ftp.cc:346
+#: methods/ftp.cc:341
 msgid "Server closed the connection"
-msgstr "Server closed the connection"
+msgstr ""
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
 msgid "Read error"
-msgstr "Read error"
+msgstr ""
 
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:351 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
-msgstr "A response overflowed the buffer."
+msgstr ""
 
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
-msgstr "Protocol corruption"
+msgstr ""
 
-#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
 msgid "Write error"
-msgstr "Write error"
+msgstr ""
 
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
 msgid "Could not create a socket"
-msgstr "Could not create a socket"
+msgstr ""
 
-#: methods/ftp.cc:707
+#: methods/ftp.cc:704
 msgid "Could not connect data socket, connection timed out"
-msgstr "Could not connect data socket, connection timed out"
+msgstr ""
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:710
 msgid "Could not connect passive socket."
-msgstr "Could not connect passive socket."
+msgstr ""
 
-#: methods/ftp.cc:730
+#: methods/ftp.cc:728
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo was unable to get a listening socket"
+msgstr ""
 
-#: methods/ftp.cc:744
+#: methods/ftp.cc:742
 msgid "Could not bind a socket"
-msgstr "Could not bind a socket"
+msgstr ""
 
-#: methods/ftp.cc:748
+#: methods/ftp.cc:746
 msgid "Could not listen on the socket"
-msgstr "Could not listen on the socket"
+msgstr ""
 
-#: methods/ftp.cc:755
+#: methods/ftp.cc:753
 msgid "Could not determine the socket's name"
-msgstr "Could not determine the socket's name"
+msgstr ""
 
-#: methods/ftp.cc:787
+#: methods/ftp.cc:785
 msgid "Unable to send PORT command"
-msgstr "Unable to send PORT command"
+msgstr ""
 
-#: methods/ftp.cc:797
+#: methods/ftp.cc:795
 #, c-format
 msgid "Unknown address family %u (AF_*)"
-msgstr "Unknown address family %u (AF_*)"
+msgstr ""
 
-#: methods/ftp.cc:806
+#: methods/ftp.cc:804
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT failed, server said: %s"
+msgstr ""
 
-#: methods/ftp.cc:826
+#: methods/ftp.cc:824
 msgid "Data socket connect timed out"
-msgstr "Data socket connect timed out"
+msgstr ""
 
-#: methods/ftp.cc:833
+#: methods/ftp.cc:831
 msgid "Unable to accept connection"
-msgstr "Unable to accept connection"
+msgstr ""
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
 msgid "Problem hashing file"
-msgstr "Problem hashing file"
+msgstr ""
 
-#: methods/ftp.cc:885
+#: methods/ftp.cc:883
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "Unable to fetch file, server said '%s'"
+msgstr ""
 
-#: methods/ftp.cc:900 methods/rsh.cc:330
+#: methods/ftp.cc:898 methods/rsh.cc:322
 msgid "Data socket timed out"
-msgstr "Data socket timed out"
+msgstr ""
 
-#: methods/ftp.cc:930
+#: methods/ftp.cc:928
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "Data transfer failed, server said '%s'"
+msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1007
+#: methods/ftp.cc:1005
 msgid "Query"
-msgstr "Query"
+msgstr ""
 
-#: methods/ftp.cc:1119
+#: methods/ftp.cc:1117
 msgid "Unable to invoke "
-msgstr "Unable to invoke "
+msgstr ""
 
-#: methods/connect.cc:75
+#: methods/connect.cc:70
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "Connecting to %s (%s)"
+msgstr ""
 
-#: methods/connect.cc:86
+#: methods/connect.cc:81
 #, c-format
 msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgstr ""
 
-#: methods/connect.cc:93
+#: methods/connect.cc:90
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr ""
 
-#: methods/connect.cc:99
+#: methods/connect.cc:96
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Cannot initiate the connection to %s:%s (%s)."
+msgstr ""
 
-#: methods/connect.cc:107
+#: methods/connect.cc:104
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Could not connect to %s:%s (%s), connection timed out"
+msgstr ""
 
-#: methods/connect.cc:125
+#: methods/connect.cc:119
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "Could not connect to %s:%s (%s)."
+msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:147 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
-msgstr "Connecting to %s"
+msgstr ""
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:165 methods/connect.cc:184
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "Could not resolve '%s'"
+msgstr ""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:190
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "Temporary failure resolving '%s'"
+msgstr ""
 
-#: methods/connect.cc:200
+#: methods/connect.cc:193
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr ""
 
-#: methods/connect.cc:247
+#: methods/connect.cc:240
 #, fuzzy, c-format
+#| msgid "Unable to write to %s"
 msgid "Unable to connect to %s:%s:"
 msgstr "ืœื ืžืฆืœื™ื— ืœื›ืชื•ื‘ ืœ-%s"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:71
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:107
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
-msgstr "At least one invalid signature was encountered."
+msgstr ""
 
-#: methods/gpgv.cc:189
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:232
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr ""
 
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
-msgstr "Unknown error executing gpgv"
+msgstr ""
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื—ื“ืฉื•ืช ื”ื‘ืื•ืช ื”ื•ืœื›ื•ืช ืœื”ื™ื•ืช ืžื•ืชืงื ื•ืช:"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
 
-#: methods/gzip.cc:65
-msgid "Empty files can't be valid archives"
+#: methods/gzip.cc:64
+#, c-format
+msgid "Couldn't open pipe for %s"
 msgstr ""
 
-#: methods/http.cc:394
+#: methods/gzip.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr ""
+
+#: methods/http.cc:385
 msgid "Waiting for headers"
-msgstr "Waiting for headers"
+msgstr ""
+
+#: methods/http.cc:531
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr ""
 
-#: methods/http.cc:544
+#: methods/http.cc:539
 msgid "Bad header line"
-msgstr "Bad header line"
+msgstr ""
 
-#: methods/http.cc:569 methods/http.cc:576
+#: methods/http.cc:558 methods/http.cc:565
 msgid "The HTTP server sent an invalid reply header"
-msgstr "The HTTP server sent an invalid reply header"
+msgstr ""
 
-#: methods/http.cc:606
+#: methods/http.cc:594
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "The HTTP server sent an invalid Content-Length header"
+msgstr ""
 
-#: methods/http.cc:621
+#: methods/http.cc:609
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "The HTTP server sent an invalid Content-Range header"
+msgstr ""
 
-#: methods/http.cc:623
+#: methods/http.cc:611
 msgid "This HTTP server has broken range support"
-msgstr "This HTTP server has broken range support"
+msgstr ""
 
-#: methods/http.cc:647
+#: methods/http.cc:635
 msgid "Unknown date format"
-msgstr "Unknown date format"
+msgstr ""
 
-#: methods/http.cc:818
+#: methods/http.cc:790
 msgid "Select failed"
-msgstr "Select failed"
-
-#: methods/http.cc:823
-msgid "Connection timed out"
-msgstr "Connection timed out"
-
-#: methods/http.cc:846
-msgid "Error writing to output file"
-msgstr "Error writing to output file"
-
-#: methods/http.cc:877
-msgid "Error writing to file"
-msgstr "Error writing to file"
-
-#: methods/http.cc:905
-msgid "Error writing to the file"
-msgstr "Error writing to the file"
-
-#: methods/http.cc:919
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Error reading from server. Remote end closed connection"
-
-#: methods/http.cc:921
-msgid "Error reading from server"
-msgstr "Error reading from server"
-
-#: methods/http.cc:1194
-msgid "Bad header data"
-msgstr "Bad header data"
-
-#: methods/http.cc:1211 methods/http.cc:1266
-msgid "Connection failed"
-msgstr "Connection failed"
-
-#: methods/http.cc:1358
-msgid "Internal error"
-msgstr "Internal error"
-
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
-#, c-format
-msgid "Unable to read %s"
-msgstr "Unable to read %s"
-
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Unable to change to %s"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:280
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "No mirror file '%s' found "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:287
-#, c-format
-msgid "Can not read mirror file '%s'"
 msgstr ""
 
-#: methods/mirror.cc:442
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Mirror: %s]"
-
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
+#: methods/http.cc:795
+msgid "Connection timed out"
 msgstr ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
 
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
+#: methods/http.cc:818
+msgid "Error writing to output file"
 msgstr ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Failed to create IPC pipe to subprocess"
-
-#: methods/rsh.cc:338
-msgid "Connection closed prematurely"
-msgstr "Connection closed prematurely"
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "Bad default setting!"
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr "Press enter to continue."
-
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Do you want to erase any previously downloaded .deb files?"
-
-#: dselect/install:101
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Some errors occurred while unpacking. Packages that were installed"
-
-#: dselect/install:102
-msgid "will be configured. This may result in duplicate errors"
-msgstr "will be configured. This may result in duplicate errors"
-
-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "or errors caused by missing dependencies. This is OK, only the errors"
 
-#: dselect/install:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+#: methods/http.cc:849
+msgid "Error writing to file"
 msgstr ""
-"above this message are important. Please fix them and run [I]nstall again"
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr "Merging available information"
-
-#: cmdline/apt-extracttemplates.cc:102
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s ื”ื•ื ืœื ื—ื‘ื™ืœืช DEB ืชืงื™ื ื”."
 
-#: cmdline/apt-extracttemplates.cc:236
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: methods/http.cc:877
+msgid "Error writing to the file"
 msgstr ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335
-#, c-format
-msgid "Unable to write to %s"
-msgstr "ืœื ืžืฆืœื™ื— ืœื›ืชื•ื‘ ืœ-%s"
-
-#: cmdline/apt-extracttemplates.cc:313
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "ืœื ืžืฆืœื™ื— ืœืงื‘ืœ ืืช ื’ืจืกืช debconf. ื”ืื debconf ืžื•ืชืงืŸ?"
-
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
-msgid "Package extension list is too long"
-msgstr "Package extension list is too long"
-
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
-#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
-#, c-format
-msgid "Error processing directory %s"
-msgstr "ืฉื’ื™ืื” ื‘ืขื™ื‘ื•ื“ ืกืคืจื™ื” %s"
-
-#: ftparchive/apt-ftparchive.cc:261
-msgid "Source extension list is too long"
-msgstr "Source extension list is too long"
-
-#: ftparchive/apt-ftparchive.cc:378
-msgid "Error writing header to contents file"
-msgstr "Error writing header to contents file"
-
-#: ftparchive/apt-ftparchive.cc:408
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error processing contents %s"
-
-#: ftparchive/apt-ftparchive.cc:596
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+#: methods/http.cc:891
+msgid "Error reading from server. Remote end closed connection"
 msgstr ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-
-#: ftparchive/apt-ftparchive.cc:802
-msgid "No selections matched"
-msgstr "ืื™ืŸ ื”ืชืืžื•ืช"
-
-#: ftparchive/apt-ftparchive.cc:880
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ื—ืœืง ืžื”ืงื‘ืฆื™ื ื—ืกืจื™ื ื‘ืงื‘ื•ืฆืช ืงื‘ืฆื™ ื”ื—ื‘ื™ืœื” `%s'"
 
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "ืžืกื“ ื”ื ืชื•ื ื™ื ืื™ื ื• ืชืงื™ืŸ, ื”ืงื•ื‘ืฅ ื”ื•ืขื‘ืจ ืœ-%s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "ืžืกื“ ื”ื ืชื•ื ื™ื ื™ืฉืŸ, ืžื ืกื” ืœืฉื“ืจื’ ืœ-%s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: methods/http.cc:893
+msgid "Error reading from server"
 msgstr ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "ืœื ืžืฆืœื™ื— ืœืคืชื•ื— ืืช ืงื•ื‘ืฅ ืžืกื“ ื”ื ืชื•ื ื™ื %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Failed to stat %s"
-
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Archive has no control record"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
-msgstr "Unable to get a cursor"
-
-#: ftparchive/writer.cc:80
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: ืœื ืžืฆืœื™ื— ืœืงืจื•ื ืืช ื”ืกืคืจื™ื” %s\n"
-
-#: ftparchive/writer.cc:85
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Unable to stat %s\n"
-
-#: ftparchive/writer.cc:141
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:143
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:150
-msgid "E: Errors apply to file "
-msgstr "E: ืฉื’ื™ืื•ืช ืชืงืคื•ืช ืœืงื•ื‘ืฅ"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
-#, c-format
-msgid "Failed to resolve %s"
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#, fuzzy
+msgid "Failed to truncate file"
 msgstr "ื›ืฉืœื•ืŸ ื‘ืคืขื ื•ื— %s"
 
-#: ftparchive/writer.cc:181
-msgid "Tree walking failed"
-msgstr "Tree walking failed"
-
-#: ftparchive/writer.cc:208
-#, c-format
-msgid "Failed to open %s"
-msgstr "ื›ืฉืœื•ืŸ ื‘ืคืชื™ื—ืช %s"
-
-#: ftparchive/writer.cc:267
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:275
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Failed to readlink %s"
-
-#: ftparchive/writer.cc:279
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Failed to unlink %s"
-
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** ื›ืฉืœื•ืŸ ื‘ืงื™ืฉื•ืจ %s ืœ-%s"
-
-#: ftparchive/writer.cc:296
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink limit of %sB hit.\n"
-
-#: ftparchive/writer.cc:401
-msgid "Archive had no package field"
-msgstr "Archive had no package field"
-
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s has no override entry\n"
-
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "ื”ืžืชื—ื–ืง ืฉืœ %s ื”ื•ื %s ื•ืœื %s\n"
-
-#: ftparchive/writer.cc:721
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s has no source override entry\n"
-
-#: ftparchive/writer.cc:725
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s has no binary override entry either\n"
-
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - ื›ืฉืœื•ืŸ ื‘ื”ืงืฆืืช ื–ื™ื›ืจื•ืŸ"
-
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
-#, c-format
-msgid "Unable to open %s"
-msgstr "ืœื ืžืฆืœื™ื— ืœืคืชื•ื— ืืช %s"
-
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
-
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr ""
-
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: methods/http.cc:1149
+msgid "Bad header data"
 msgstr ""
 
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Failed to read the override file %s"
-
-#: ftparchive/multicompress.cc:70
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' ืืœื’ื•ืจื™ืชื ื“ื—ื™ื” ืœื ื™ื“ื•ืข"
-
-#: ftparchive/multicompress.cc:100
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Compressed output %s needs a compression set"
-
-#: ftparchive/multicompress.cc:189
-msgid "Failed to create FILE*"
-msgstr "Failed to create FILE*"
-
-#: ftparchive/multicompress.cc:192
-msgid "Failed to fork"
-msgstr "ื›ืฉืœื•ืŸ ื‘ื‘ื™ืฆื•ืข fork"
-
-#: ftparchive/multicompress.cc:206
-msgid "Compress child"
-msgstr "Compress child"
-
-#: ftparchive/multicompress.cc:229
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ืฉื’ื™ืื” ืคื ื™ืžื™ืช, ื›ืœืฉื•ืŸ ื‘ื™ืฆื™ืจืช %s"
-
-#: ftparchive/multicompress.cc:304
-msgid "IO to subprocess/file failed"
-msgstr "IO to subprocess/file failed"
-
-#: ftparchive/multicompress.cc:342
-msgid "Failed to read while computing MD5"
-msgstr "Failed to read while computing MD5"
-
-#: ftparchive/multicompress.cc:358
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem unlinking %s"
-
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "ื›ืฉืœื•ืŸ ื‘ืฉื™ื ื•ื™ ื”ืฉื %s ืœ-%s"
-
-#: cmdline/apt-internal-solver.cc:37
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: methods/http.cc:1166 methods/http.cc:1221
+msgid "Connection failed"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Unknown package record!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: methods/http.cc:1313
+msgid "Internal error"
 msgstr ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:117
-msgid "Failed to create pipes"
-msgstr "Failed to create pipes"
-
-#: apt-inst/contrib/extracttar.cc:144
-msgid "Failed to exec gzip "
-msgstr "Failed to exec gzip "
-
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
-msgid "Corrupted archive"
-msgstr "Corrupted archive"
-
-#: apt-inst/contrib/extracttar.cc:196
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar checksum failed, archive corrupted"
-
-#: apt-inst/contrib/extracttar.cc:303
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Unknown TAR header type %u, member %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "Invalid archive signature"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "Error reading archive member header"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Invalid archive member header %s"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "Invalid archive member header"
 
-#: apt-inst/contrib/arfile.cc:132
-msgid "Archive is too short"
-msgstr "Archive is too short"
-
-#: apt-inst/contrib/arfile.cc:136
-msgid "Failed to read the archive headers"
-msgstr "Failed to read the archive headers"
-
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
-msgstr "DropNode called on still linked node"
-
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
-msgstr "Failed to locate the hash element!"
-
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
-msgstr "Failed to allocate diversion"
-
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
-msgstr "Internal error in AddDiversion"
-
-#: apt-inst/filelist.cc:479
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s"
-
-#: apt-inst/filelist.cc:508
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Double add of diversion %s -> %s"
-
-#: apt-inst/filelist.cc:551
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicate conf file %s/%s"
-
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "ื›ืฉืœื•ืŸ ื‘ืคืขื ื•ื— %s"
-
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Failed to close file %s"
-
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
-#, c-format
-msgid "The path %s is too long"
-msgstr "The path %s is too long"
-
-#: apt-inst/extract.cc:127
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Unpacking %s more than once"
-
-#: apt-inst/extract.cc:137
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "The directory %s is diverted"
-
-#: apt-inst/extract.cc:147
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "The package is trying to write to the diversion target %s/%s"
-
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
-msgid "The diversion path is too long"
-msgstr "The diversion path is too long"
-
-#: apt-inst/extract.cc:243
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "The directory %s is being replaced by a non-directory"
-
-#: apt-inst/extract.cc:283
-msgid "Failed to locate node in its hash bucket"
-msgstr "Failed to locate node in its hash bucket"
-
-#: apt-inst/extract.cc:287
-msgid "The path is too long"
-msgstr "The path is too long"
-
-#: apt-inst/extract.cc:415
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Overwrite package match with no version for %s"
-
-#: apt-inst/extract.cc:432
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "File %s/%s overwrites the one in the package %s"
-
-#: apt-inst/extract.cc:492
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Unable to stat %s"
-
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "This is not a valid DEB archive, missing '%s' member"
-
-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:55
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-
-#: apt-inst/deb/debfile.cc:120
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Internal error, could not locate member %s"
-
-#: apt-inst/deb/debfile.cc:214
-msgid "Unparsable control file"
-msgstr "Unparsable control file"
-
-#: apt-pkg/contrib/mmap.cc:79
+#: apt-pkg/contrib/mmap.cc:76
 msgid "Can't mmap an empty file"
-msgstr "Can't mmap an empty file"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Couldn't duplicate file descriptor %i"
-
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:146
-msgid "Unable to close mmap"
-msgstr "Unable to close mmap"
-
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-msgid "Unable to synchronize mmap"
-msgstr "Unable to synchronize mmap"
-
-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr "Couldn't make mmap of %lu bytes"
-
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "ื›ืฉืœื•ืŸ ื‘ืคืขื ื•ื— %s"
+msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/contrib/mmap.cc:234
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:440
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-
-#: apt-pkg/contrib/mmap.cc:443
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:346
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:353
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:360
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:365
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1040
 #, c-format
 msgid "Selection %s not found"
-msgstr "Selection %s not found"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:458
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Unrecognized type abbreviation: '%c'"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:516
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "Opening configuration file %s"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:773
+#: apt-pkg/contrib/configuration.cc:684
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntax error %s:%u: Block starts with no name."
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:792
+#: apt-pkg/contrib/configuration.cc:703
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntax error %s:%u: Malformed tag"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:720
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntax error %s:%u: Extra junk after value"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:849
+#: apt-pkg/contrib/configuration.cc:760
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:856
+#: apt-pkg/contrib/configuration.cc:767
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntax error %s:%u: Too many nested includes"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntax error %s:%u: Included from here"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:869
+#: apt-pkg/contrib/configuration.cc:780
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntax error %s:%u: Unsupported directive '%s'"
-
-#: apt-pkg/contrib/configuration.cc:872
-#, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Syntax error %s:%u: clear directive requires an option tree as argument"
 
-#: apt-pkg/contrib/configuration.cc:922
+#: apt-pkg/contrib/configuration.cc:831
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntax error %s:%u: Extra junk at end of file"
+msgstr ""
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s... Error!"
+msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Done"
-msgstr "%c%s... Done"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:80
+#: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Command line option '%c' [from %s] is not known."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "Command line option %s is not understood"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Command line option %s is not boolean"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "Option %s requires an argument."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:234
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s requires an integer argument, not '%s'"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:265
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "Option '%s' is too long"
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
-msgstr "Sense %s is not understood, try true or false."
+msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
-msgstr "Invalid operation %s"
+msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/contrib/cdromutl.cc:52
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "Unable to stat the mount point %s"
-
-#: apt-pkg/contrib/cdromutl.cc:224
-msgid "Failed to stat the cdrom"
-msgstr "Failed to stat the cdrom"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:93
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
 #, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problem closing the gzip file %s"
+msgid "Unable to change to %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/cdromutl.cc:195
+msgid "Failed to stat the cdrom"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "Not using locking for read only lock file %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "Could not open lock file %s"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Not using locking for nfs mounted lock file %s"
-
-#: apt-pkg/contrib/fileutl.cc:252
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Could not get lock %s"
-
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:176
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "Could not get lock %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:453
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:456
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
-msgstr "Sub-process %s received a segmentation fault."
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:458
 #, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Sub-process %s received signal %u."
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "Sub-process %s returned an error code (%u)"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:464
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "Sub-process %s exited unexpectedly"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:508
 #, c-format
 msgid "Could not open file %s"
-msgstr "Could not open file %s"
-
-#: apt-pkg/contrib/fileutl.cc:1046
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Could not open file descriptor %d"
-
-#: apt-pkg/contrib/fileutl.cc:1136
-msgid "Failed to create subprocess IPC"
-msgstr "Failed to create subprocess IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1192
-msgid "Failed to exec compressor "
-msgstr "Failed to exec compressor "
-
-#: apt-pkg/contrib/fileutl.cc:1289
-#, c-format
-msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:564
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:594
 #, c-format
-msgid "Problem closing the file %s"
-msgstr "Problem closing the file %s"
+msgid "write, still have %lu to write but couldn't"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1728
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problem renaming the file %s to %s"
+#: apt-pkg/contrib/fileutl.cc:669
+msgid "Problem closing the file"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1739
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problem unlinking the file %s"
+#: apt-pkg/contrib/fileutl.cc:675
+msgid "Problem unlinking the file"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:686
 msgid "Problem syncing the file"
-msgstr "Problem syncing the file"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
-msgstr "Empty package cache"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
-msgstr "The package cache file is corrupted"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:159
+#: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
-msgstr "The package cache file is an incompatible version"
-
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "This APT does not support the versioning system '%s'"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:172
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
-msgstr "The package cache was built for a different architecture"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:225
 msgid "Depends"
-msgstr "Depends"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:225
 msgid "PreDepends"
-msgstr "PreDepends"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:225
 msgid "Suggests"
-msgstr "Suggests"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:226
 msgid "Recommends"
-msgstr "Recommends"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:226
 msgid "Conflicts"
-msgstr "Conflicts"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:226
 msgid "Replaces"
-msgstr "Replaces"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:227
 msgid "Obsoletes"
-msgstr "Obsoletes"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:227
 msgid "Breaks"
-msgstr "Breaks"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:227
 msgid "Enhances"
-msgstr "Enhances"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:238
 msgid "important"
-msgstr "important"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:238
 msgid "required"
-msgstr "required"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:238
 msgid "standard"
-msgstr "standard"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:239
 msgid "optional"
-msgstr "optional"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:239
 msgid "extra"
-msgstr "extra"
+msgstr ""
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
 msgid "Building dependency tree"
-msgstr "Building dependency tree"
+msgstr ""
 
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:124
 msgid "Candidate versions"
-msgstr "Candidate versions"
+msgstr ""
 
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:153
 msgid "Dependency generation"
-msgstr "Dependency generation"
+msgstr ""
 
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
-msgstr "Reading state information"
+msgstr ""
 
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/depcache.cc:223
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "ื›ืฉืœื•ืŸ ื‘ืคืชื™ื—ืช %s"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:229
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "ื›ืฉืœื•ืŸ ื‘ืคืขื ื•ื— %s"
 
-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "Unable to parse package file %s (1)"
+msgstr ""
 
-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/tagfile.cc:189
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "Unable to parse package file %s (2)"
-
-#: apt-pkg/sourcelist.cc:96
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Malformed line %lu in source list %s ([option] unparseable)"
-
-#: apt-pkg/sourcelist.cc:99
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Malformed line %lu in source list %s ([option] too short)"
-
-#: apt-pkg/sourcelist.cc:110
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Malformed line %lu in source list %s ([%s] is not an assignment)"
-
-#: apt-pkg/sourcelist.cc:116
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Malformed line %lu in source list %s ([%s] has no key)"
-
-#: apt-pkg/sourcelist.cc:119
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:90
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Malformed line %lu in source list %s (URI)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:92
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Malformed line %lu in source list %s (dist)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:95
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:101
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:108
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Opening %s"
-msgstr "Opening %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "Line %u too long in source list %s."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:243
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "Malformed line %u in source list %s (type)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:247
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Type '%s' is not known on line %u in source list %s"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
 #, c-format
-msgid "Could not configure '%s'. "
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:545
+#: apt-pkg/packagemanager.cc:440
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/packagemanager.cc:478
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'. Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "Index file type '%s' is not supported"
+msgstr ""
 
-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1138
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1140
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "Unable to correct problems, you have held broken packages."
+msgstr ""
 
-#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
 msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
+"Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:81
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "List directory %spartial is missing."
-
-#: apt-pkg/acquire.cc:85
+#: apt-pkg/acquire.cc:60
 #, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archives directory %spartial is missing."
+msgid "Lists directory %spartial is missing."
+msgstr ""
 
-#: apt-pkg/acquire.cc:93
+#: apt-pkg/acquire.cc:64
 #, c-format
-msgid "Unable to lock directory %s"
-msgstr "Unable to lock directory %s"
+msgid "Archive directory %spartial is missing."
+msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/acquire.cc:826
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Retrieving file %li of %li (%s remaining)"
+msgstr ""
 
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/acquire.cc:828
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "Retrieving file %li of %li"
+msgstr ""
 
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire-worker.cc:110
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr "The method driver %s could not be found."
+msgstr ""
 
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:159
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "Method %s did not start correctly"
+msgstr ""
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:133
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "Packaging system '%s' is not supported"
+msgstr ""
 
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:149
 msgid "Unable to determine a suitable packaging system type"
-msgstr "Unable to determine a suitable packaging system type"
+msgstr ""
 
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
 #, c-format
 msgid "Unable to stat %s."
-msgstr "Unable to stat %s."
+msgstr ""
 
-#: apt-pkg/srcrecords.cc:47
+#: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "You must put some 'source' URIs in your sources.list"
+msgstr ""
 
-#: apt-pkg/cachefile.cc:87
+#: apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
-msgstr "The package lists or status file could not be parsed or opened."
+msgstr ""
 
-#: apt-pkg/cachefile.cc:91
+#: apt-pkg/cachefile.cc:75
 msgid "You may want to run apt-get update to correct these problems"
-msgstr "You may want to run apt-get update to correct these problems"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "ืจืฉื™ืžืช ื”ืžืงื•ืจื•ืช ืœื ื ื™ืชื ืช ืœืงืจื™ืื”."
-
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
 msgstr ""
 
-#: apt-pkg/policy.cc:399
+#: apt-pkg/policy.cc:347
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Invalid record in the preferences file %s, no Package header"
+msgstr ""
 
-#: apt-pkg/policy.cc:421
+#: apt-pkg/policy.cc:369
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "Did not understand pin type %s"
+msgstr ""
 
-#: apt-pkg/policy.cc:429
+#: apt-pkg/policy.cc:377
 msgid "No priority (or zero) specified for pin"
-msgstr "No priority (or zero) specified for pin"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:87
+#: apt-pkg/pkgcachegen.cc:74
 msgid "Cache has an incompatible versioning system"
-msgstr "Cache has an incompatible versioning system"
+msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:132
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:166
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:191
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:195
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:226
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Package %s %s was not found while processing file dependencies"
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1146
+#: apt-pkg/pkgcachegen.cc:230
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Couldn't stat source package list %s"
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338
-#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501
-msgid "Reading package lists"
-msgstr "Reading package lists"
+#: apt-pkg/pkgcachegen.cc:234
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1251
-msgid "Collecting File Provides"
-msgstr "Collecting File Provides"
+#: apt-pkg/pkgcachegen.cc:258
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450
-msgid "IO Error saving source cache"
-msgstr "IO Error saving source cache"
+#: apt-pkg/pkgcachegen.cc:264
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "rename failed, %s (%s -> %s)."
+#: apt-pkg/pkgcachegen.cc:267
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:599
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum mismatch"
+#: apt-pkg/pkgcachegen.cc:270
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum mismatch"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/pkgcachegen.cc:301
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/pkgcachegen.cc:314
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1428
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "There is no public key available for the following key IDs:\n"
-
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/pkgcachegen.cc:693
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Couldn't stat source package list %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1521
-#, c-format
-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+#: apt-pkg/pkgcachegen.cc:778
+msgid "Collecting File Provides"
 msgstr ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:128
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG error: %s: %s"
+msgid "rename failed, %s (%s -> %s)."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:395
+msgid "MD5Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+msgid "Hash Sum mismatch"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1106
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1216
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
 
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1275
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1316
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"The package index files are corrupted. No Filename: field for package %s."
 
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1403
 msgid "Size mismatch"
-msgstr "Size mismatch"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:40
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ืœื ืžืฆืœื™ื— ืœืคืชื•ื— ืืช ืงื•ื‘ืฅ ืžืกื“ ื”ื ืชื•ื ื™ื %s: %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:47
 #, c-format
 msgid "No sections in Release file %s"
-msgstr "No sections in Release file %s"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:81
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr "No Hash entry in Release file %s"
-
-#: apt-pkg/indexrecords.cc:121
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Invalid 'Valid-Until' entry in Release file %s"
-
-#: apt-pkg/indexrecords.cc:140
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Invalid 'Date' entry in Release file %s"
+msgstr ""
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "Vendor block %s contains no fingerprint"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:525
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
 msgid "Identifying.. "
-msgstr "Identifying.. "
+msgstr ""
 
-#: apt-pkg/cdrom.cc:613
+#: apt-pkg/cdrom.cc:559
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Stored label: %s\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
 msgid "Unmounting CD-ROM...\n"
-msgstr "Unmounting CD-ROM...\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:585
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "Using CD-ROM mount point %s\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:603
 msgid "Unmounting CD-ROM\n"
-msgstr "Unmounting CD-ROM\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:607
 msgid "Waiting for disc...\n"
-msgstr "Waiting for disc...\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:674
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:615
 msgid "Mounting CD-ROM...\n"
-msgstr "Mounting CD-ROM...\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:633
 msgid "Scanning disc for index files..\n"
-msgstr "Scanning disc for index files..\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:673
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
 msgstr ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:684
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
 
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:710
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "Found label '%s'\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:739
 msgid "That is not a valid name, try again.\n"
-msgstr "That is not a valid name, try again.\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:755
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
-"This disc is called: \n"
-"'%s'\n"
 
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:759
 msgid "Copying package lists..."
-msgstr "Copying package lists..."
+msgstr ""
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:785
 msgid "Writing new source list\n"
-msgstr "Writing new source list\n"
+msgstr ""
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:794
 msgid "Source list entries for this disc are:\n"
-msgstr "Source list entries for this disc are:\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records.\n"
-msgstr "Wrote %i records.\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
-msgstr "Wrote %i records with %i missing files.\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Wrote %i records with %i mismatched files\n"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Can't find authentication record for: %s"
-
-#: apt-pkg/indexcopy.cc:521
-#, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash mismatch for: %s"
-
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No keyring installed in %s."
-
-#: apt-pkg/cacheset.cc:403
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' for '%s' was not found"
-
-#: apt-pkg/cacheset.cc:406
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version '%s' for '%s' was not found"
-
-#: apt-pkg/cacheset.cc:517
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Couldn't find task '%s'"
-
-#: apt-pkg/cacheset.cc:523
+#: apt-pkg/indexcopy.cc:530
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Couldn't find any package by regex '%s'"
-
-#: apt-pkg/cacheset.cc:534
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/indexcopy.cc:536
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Can't find authentication record for: %s"
 msgstr ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-
-#: apt-pkg/cacheset.cc:555
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "Can't select newest version from package '%s' as it is purely virtual"
 
-#: apt-pkg/cacheset.cc:563
+#: apt-pkg/indexcopy.cc:542
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "Can't select candidate version from package %s as it has no candidate"
-
-#: apt-pkg/cacheset.cc:571
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "Can't select installed version from package %s as it is not installed"
-
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
-msgid "Execute external solver"
+msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:49
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "ืžื•ืชืงืŸ:"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
 #, c-format
 msgid "Configuring %s"
-msgstr "Configuring %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
 #, c-format
 msgid "Removing %s"
-msgstr "Removing %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Completely removing %s"
-msgstr "Completely removing %s"
-
-#: apt-pkg/deb/dpkgpm.cc:77
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Noting disappearance of %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:53
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr "Running post-installation trigger %s"
+msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:558
 #, c-format
 msgid "Directory '%s' missing"
-msgstr "Directory '%s' missing"
-
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Could not open file '%s'"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:654
 #, c-format
 msgid "Preparing %s"
-msgstr "Preparing %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Unpacking %s"
-msgstr "Unpacking %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:660
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "Preparing to configure %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:662
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "ืžื•ืชืงืŸ:"
 
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:667
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr "Preparing for removal of %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:669
 #, c-format
 msgid "Removed %s"
-msgstr "Removed %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:674
 #, c-format
 msgid "Preparing to completely remove %s"
-msgstr "Preparing to completely remove %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:675
 #, c-format
 msgid "Completely removed %s"
-msgstr "Completely removed %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1213
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-
-#: apt-pkg/deb/dpkgpm.cc:1243
-msgid "Running dpkg"
-msgstr "Running dpkg"
-
-#: apt-pkg/deb/dpkgpm.cc:1415
-msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1477
-msgid "No apport report written because MaxReports is reached already"
-msgstr "No apport report written because MaxReports is reached already"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
-msgid "dependency problems - leaving unconfigured"
-msgstr "dependency problems - leaving unconfigured"
-
-#: apt-pkg/deb/dpkgpm.cc:1484
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-
-#: apt-pkg/deb/dpkgpm.cc:1490
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"No apport report written because the error message indicates a disk full "
-"error"
-
-#: apt-pkg/deb/dpkgpm.cc:1496
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/deb/dpkgpm.cc:879
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
-"No apport report written because the error message indicates a out of memory "
-"error"
 
-#: apt-pkg/deb/dpkgpm.cc:1503
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: apt-pkg/deb/dpkgpm.cc:909
+msgid "Running dpkg"
 msgstr ""
-"No apport report written because the error message indicates a dpkg I/O error"
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:70
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:73
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "ืœื ืžืฆืœื™ื— ืœื ืขื•ืœ ืืช ืกืคืจื™ืช ื”ื”ื•ืจื“ื”."
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
-#, c-format
+#: apt-pkg/deb/debsystem.cc:82
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
 msgstr ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:100
 msgid "Not locked"
-msgstr "Not locked"
-
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
 msgstr ""
 
-#~ msgid "You must give exactly one pattern"
-#~ msgstr "ืืชื” ื—ื™ื™ื‘ ืœืชืช ื‘ื“ื™ื•ืง ืชื‘ื ื™ืช ืื—ืช"
-
-#, fuzzy
-#~ msgid ""
-#~ "The following packages were automatically installed and are no longer "
-#~ "required:"
-#~ msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื—ื“ืฉื•ืช ื”ื‘ืื•ืช ื”ื•ืœื›ื•ืช ืœื”ื™ื•ืช ืžื•ืชืงื ื•ืช:"
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "%lu packages were automatically installed and are no longer required.\n"
-#~ msgstr "ื”ื—ื‘ื™ืœื•ืช ื”ื—ื“ืฉื•ืช ื”ื‘ืื•ืช ื”ื•ืœื›ื•ืช ืœื”ื™ื•ืช ืžื•ืชืงื ื•ืช:"
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
 
 #~ msgid "       %4i %s\n"
 #~ msgstr "       %4i %s\n"
diff --git a/po/hu.po b/po/hu.po
index 20da3d907..38c30018d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt trunk\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-25 17:09+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -99,73 +99,73 @@ msgstr "Nyilvรกntartott terรผlet รถsszesen: "
 msgid "Package file %s is out of sync."
 msgstr "%s csomagfรกjl nincs szinkronban."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nem talรกlhatรณk csomagok"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Legalรกbb egy keresรฉsi mintรกt meg kell adnia"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ez a parancs elavult. Hasznรกlja helyette az โ€žapt-mark showautoโ€-t."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ez a csomag nem talรกlhatรณ: %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Csomagfรกjlok:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A gyorsรญtรณtรกr nincs szinkronban, nem lehet kereszthivatkozni a csomagfรกjlra"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Rรถgzรญtett csomagok:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nem talรกlhatรณ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Telepรญtve: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Jelรถlt: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(nincs)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Csomagrรถgzรญtรฉs: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Verziรณtรกblรกzat:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s lefordรญtva ekkor: %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,20 +236,28 @@ msgstr ""
 "Lรกsd az apt-cache(8) รฉs apt.conf(5) kรฉzikรถnyvlapokat tovรกbbi "
 "informรกciรณkรฉrt.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Adja meg a lemez nevรฉt, mint pรฉldรกul โ€žDebian 5.0.3 1. lemezโ€"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Helyezzen be egy lemezt a meghajtรณba, รฉs nyomja meg az Entert"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "โ€ž%sโ€ csatolรกsa a(z) โ€ž%sโ€ kรถnyvtรกrba meghiรบsult"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ismรฉtelje meg a folyamatot kรฉszlete tรถbbi CD-jรฉvel is."
 
@@ -481,7 +489,7 @@ msgstr "%s รบjratelepรญtรฉse nem lehetsรฉges, mert nem lehet letรถlteni.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s mรกr a legรบjabb verziรณ.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kรฉzi telepรญtรฉsลฑre รกllรญtva.\n"
@@ -588,8 +596,8 @@ msgstr "A mลฑvelet utรกn %sB lemezterรผlet kerรผl felhasznรกlรกsra.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "A mลฑvelet utรกn %sB lemezterรผlet szabadul fel.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem hatรกrozhatรณ meg a szabad hely mennyisรฉge itt: %s"
@@ -628,7 +636,7 @@ msgstr "Megszakรญtva."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarja [I/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letรถltรฉs: %s  %s\n"
@@ -637,7 +645,7 @@ msgstr "Sikertelen letรถltรฉs: %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Nรฉhรกny fรกjlt nem sikerรผlt letรถlteni"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "A letรถltรฉs befejezล‘dรถtt a โ€žcsak letรถltรฉsโ€ mรณdban"
 
@@ -724,7 +732,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Az alรกbbi informรกciรณk segรญthetnek megoldani a problรฉmรกt:"
 
@@ -776,7 +784,7 @@ msgstr ""
 "Teljesรญtetlen fรผggล‘sรฉgek. Prรณbรกlja kiadni az โ€žapt-get -f installโ€ parancsot "
 "csomagok nรฉlkรผl (vagy telepรญtse a fรผggล‘sรฉgeket is!)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -788,33 +796,33 @@ msgstr ""
 "hasznรกlja, akkor nรฉhรกny igรฉnyelt csomag mรฉg nem kรฉszรผlt el vagy ki\n"
 "lett mozdรญtva az Incoming-bรณl."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Tรถrรถtt csomagok"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Az alรกbbi extra csomagok kerรผlnek telepรญtรฉsre:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Ajรกnlott csomagok:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alรกbbi csomag nem talรกlhatรณ: %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s megjelรถlve automatikusan telepรญtettkรฉnt.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -822,47 +830,47 @@ msgstr ""
 "Ez a parancs elavult. Hasznรกlja helyette az โ€žapt-mark autoโ€ รฉs az โ€žapt-mark "
 "autoโ€ parancsokat."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Frissรญtรฉs kiszรกmรญtรกsa... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Kรฉsz"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belsล‘ hiba, a problรฉmamegoldรณ hibรกt okozott"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Nem lehet zรกrolni a letรถltรฉsi kรถnyvtรกrat"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nem talรกlhatรณ forrรกs a(z) โ€ž%2$sโ€ โ€ž%1$sโ€ verziรณjรกnak letรถltรฉsรฉhez"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Letรถltรฉs: %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Legalรกbb egy csomagot meg kell adni, amelynek a forrรกsรกt le kell tรถlteni"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem talรกlhatรณ forrรกscsomag ehhez: %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -872,7 +880,7 @@ msgstr ""
 "karbantartva:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -883,70 +891,70 @@ msgstr ""
 "bzr branch %s\n"
 "a csomag legรบjabb (esetleg kiadatlan) frissรญtรฉseinek letรถltรฉsรฉhez.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A mรกr letรถltรถtt โ€ž%sโ€ fรกjl kihagyรกsa\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elรฉg szabad hely itt: %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Letรถltendล‘ forrรกsadat-mennyisรฉg: %sB/%sB.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Letรถltendล‘ forrรกsadat-mennyisรฉg: %sB.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrรกs letรถltรฉse: %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerรผlt nรฉhรกny archรญvumot letรถlteni."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Egy mรกr kibontott forrรกs kibontรกsรกnak kihagyรกsa itt: %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "โ€ž%sโ€ kibontรกsi parancs nem sikerรผlt.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ellenล‘rizze, hogy a โ€ždpkg-devโ€ csomag telepรญtve van-e.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "โ€ž%sโ€ elkรฉszรญtรฉsi parancs nem sikerรผlt.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnรกl"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Legalรกbb egy csomagot adjon meg, amelynek fordรญtรกsi fรผggล‘sรฉgeit ellenล‘rizni "
 "kell"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -955,17 +963,17 @@ msgstr ""
 "Nem รฉrhetล‘k el architektรบrainformรกciรณk ehhez: %s. A beรกllรญtรกsokkal "
 "kapcsolatban lรกsd az apt.conf(5) APT::Architectures rรฉszรฉt."
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nem lehet %s fordรญtรกsi fรผggล‘sรฉgeinek informรกciรณit letรถlteni"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nincs fordรญtรกsi fรผggล‘sรฉge a kรถvetkezล‘nek: %s.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -974,7 +982,7 @@ msgstr ""
 "%2$s csomag %1$s fรผggล‘sรฉge nem elรฉgรญthetล‘ ki, mert a(z) %3$s nem "
 "engedรฉlyezett a(z) โ€ž%4$sโ€ csomagokon"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -983,14 +991,14 @@ msgstr ""
 "%2$s csomag %1$s fรผggล‘sรฉge nem elรฉgรญthetล‘ ki, mert a(z) %3$s csomag nem "
 "talรกlhatรณ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s csomag %1$s fรผggล‘sรฉge nem elรฉgรญthetล‘ ki: a telepรญtett %3$s csomag tรบl "
 "friss"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -999,7 +1007,7 @@ msgstr ""
 "%2$s csomag %1$s fรผggล‘sรฉge nem elรฉgรญthetล‘ ki, mert a(z) %3$s csomag elรฉrhetล‘ "
 "verziรณja nem elรฉgรญti ki a verziรณkรถvetelmรฉnyeket"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1008,30 +1016,30 @@ msgstr ""
 "%2$s csomag %1$s fรผggล‘sรฉge nem elรฉgรญthetล‘ ki, mert a(z) %3$s csomagnak nincs "
 "jelรถlt verziรณja"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s csomag %1$s fรผggล‘sรฉge nem elรฉgรญthetล‘ ki: %3$s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s รฉpรญtรฉsi fรผggล‘sรฉgei nem elรฉgรญthetล‘k ki."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerรผlt az รฉpรญtรฉsi fรผggล‘sรฉgeket feldolgozni"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Vรกltozรกsi naplรณ ehhez: %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Tรกmogatott modulok:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1120,7 +1128,7 @@ msgstr ""
 "informรกciรณkรฉrt รฉs opciรณkรฉrt.\n"
 "                       Ez az APT a SzuperTehรฉn Hatalmรกval rendelkezik.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1195,7 +1203,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s eddig sem volt visszafogva.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Nem talรกlhatรณ a(z) %s, a vรกrakozรกs utรกn sem"
@@ -1356,8 +1365,8 @@ msgstr "Idล‘tรบllรฉpรฉs a kapcsolatban"
 msgid "Server closed the connection"
 msgstr "A kiszolgรกlรณ lezรกrta a kapcsolatot"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Olvasรกsi hiba"
 
@@ -1370,8 +1379,8 @@ msgid "Protocol corruption"
 msgstr "Protokollhiba"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "รrรกsi hiba"
 
@@ -1426,7 +1435,7 @@ msgstr "Az adatfoglalathoz kapcsolรณdรกs tรบllรฉpte az idล‘korlรกtot"
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problรฉma a fรกjl hash รฉrtรฉkรฉnek meghatรกrozรกsakor"
 
@@ -1453,86 +1462,99 @@ msgstr "Lekรฉrdezรฉs"
 msgid "Unable to invoke "
 msgstr "Nem lehet meghรญvni "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Csatlakozรกs: %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Foglalat lรฉtrehozรกsa sikertelen ehhez: %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kapcsolat lรฉtrehozรกsa sikertelen ehhez: %s: %s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Idล‘tรบllรฉpรฉs miatt nem lehet kapcsolรณdni a kรถvetkezล‘hรถz: %s: %s (%s)"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nem lehet kapcsolรณdni ehhez: %s: %s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kapcsolรณdรกs: %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nem lehet feloldani a kรถvetkezล‘t: โ€ž%sโ€"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "รtmeneti hiba โ€ž%sโ€ feloldรกsa kรถzben"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Hiba tรถrtรฉnt โ€ž%s:%sโ€ feloldรกsakor (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Hiba tรถrtรฉnt โ€ž%s:%sโ€ feloldรกsakor (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Belsล‘ hiba: Jรณ alรกรญrรกs, de nem รกllapรญthatรณ meg a kulcs ujjlenyomata."
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Legalรกbb egy alรกรญrรกs รฉrvรฉnytelen."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nem indรญthatรณ el a โ€žgpgvโ€ az alรกรญrรกs ellenล‘rzรฉsรฉhez (telepรญtve van a gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatรกsi hiba"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Az alรกbbi alรกรญrรกsok รฉrvรฉnytelenek voltak:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1572,53 +1594,53 @@ msgstr "A HTTP-kiszolgรกlรณ tartomรกnytรกmogatรกsa sรฉrรผlt"
 msgid "Unknown date format"
 msgstr "Ismeretlen dรกtumformรกtum"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "A kivรกlasztรกs sikertelen"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Idล‘tรบllรฉpรฉs a kapcsolatban"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fรกjl รญrรกsakor"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Hiba a fรกjl รญrรกsakor"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Hiba a fรกjl รญrรกsakor"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Hiba a kiszolgรกlรณrรณl olvasรกskor, a tรบloldal lezรกrta a kapcsolatot"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgรกlรณrรณl olvasรกskor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Rossz fejlรฉcadatok"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolรณdรกs"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Belsล‘ hiba"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvashatรณ"
@@ -1645,7 +1667,12 @@ msgstr "Nem talรกlhatรณ a(z) โ€ž%sโ€ tรผkรถrfรกjl "
 msgid "Can not read mirror file '%s'"
 msgstr "A(z) โ€ž%sโ€ tรผkรถrfรกjl nem olvashatรณ"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "A(z) โ€ž%sโ€ tรผkรถrfรกjl nem olvashatรณ"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Tรผkรถr: %s]"
@@ -1742,7 +1769,7 @@ msgstr ""
 "  -c=? Ezt a konfigurรกciรณs fรกjlt olvassa be\n"
 "  -o=? Beรกllรญt egy tetszล‘leges konfigurรกciรณs opciรณt, pl -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nem lehet รญrni ebbe: %s"
@@ -1889,8 +1916,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "A(z) %s DB fรกjlt nem lehet megnyitni: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s elรฉrรฉse sikertelen"
@@ -1903,87 +1930,87 @@ msgstr "Az archรญvumnak nincs vezรฉrlล‘ rekordja"
 msgid "Unable to get a cursor"
 msgstr "Nem sikerรผlt egy mutatรณhoz jutni"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "F: nem lehet a(z) %s kรถnyvtรกrat olvasni\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "F: %s nem รฉrhetล‘ el\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "H: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "H: Hibรกs a fรกjl "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nem sikerรผlt feloldani ezt: %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Fabejรกrรกs nem sikerรผlt"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s megnyitรกsa sikertelen"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink nem hajthatรณ vรฉgre erre: %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s tรถrlรฉse sikertelen"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s linkelรฉse sikertelen ehhez: %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " a DeLink korlรกtja (%sB) elรฉrve.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Az archรญvumnak nem volt csomag mezล‘je"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nem rendelkezik felรผlbรญrรกlรณ bejegyzรฉssel\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s karbantartรณja %s, nem %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nem rendelkezik forrรกs-felรผlbรญrรกlรณ bejegyzรฉssel\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nem rendelkezik binรกris-felรผlbรญrรกlรณ bejegyzรฉssel sem\n"
@@ -2057,7 +2084,7 @@ msgstr "Olvasรกsi hiba az MD5 kiszรกmรญtรกsakor"
 msgid "Problem unlinking %s"
 msgstr "Hiba %s tรถrlรฉsekor"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "โ€ž%sโ€ รกtnevezรฉse sikertelen erre: %s"
@@ -2116,23 +2143,23 @@ msgstr ""
 "  -c=? Ezt a konfigurรกciรณs fรกjlt olvassa be\n"
 "  -o=? Beรกllรญt egy tetszล‘leges konfigurรกciรณs opciรณt, pl -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Nem sikerรผlt adatcsatornรกkat lรฉtrehozni"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Nem sikerรผlt a gzipet futtatni "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Hibรกs archรญvum"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar ellenล‘rzล‘รถsszeg nem egyezik, az archรญvum megsรฉrรผlt"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ismeretlen a(z) %u TAR fejlรฉctรญpus, %s tag"
@@ -2203,54 +2230,54 @@ msgstr "A(z) %s fรกjl รญrรกsa sikertelen"
 msgid "Failed to close file %s"
 msgstr "A(z) %s fรกjl bezรกrรกsa sikertelen"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "A(z) %s รบtvonal tรบl hosszรบ"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "A(z) %s tรถbbszรถri kicsomagolรกsa"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "A(z) %s kรถnyvtรกr eltรฉrรญtve"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "A csomag megprรณbรกl รญrni a(z) %s/%s eltรฉrรญtett cรฉlpontba"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Az eltรฉrรญtett รบtvonal tรบl hosszรบ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "A(z) %s kรถnyvtรกr nem egy kรถnyvtรกrral lesz helyettesรญtve"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nem sikerรผlt a node helyรฉt megtalรกlni a hashtรกrolรณban"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Az รบtvonal tรบl hosszรบ"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Csomagtalรกlat felรผlรญrรกsa %s verziรณja nรฉlkรผl"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "A(z) %s/%s fรกjl felรผlรญrja a(z) %s csomagban levล‘t"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s nem รฉrhetล‘ el"
@@ -2332,30 +2359,30 @@ msgstr ""
 "automatikus emelรฉst."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lin %liรณ %lip %limp"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liรณ %lip %limp"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%lip %limp"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%limp"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kivรกlasztรกs nem talรกlhatรณ"
@@ -2427,6 +2454,16 @@ msgstr "%c%s... Hiba!"
 msgid "%c%s... Done"
 msgstr "%c%s... Kรฉsz"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Kรฉsz"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2488,45 +2525,45 @@ msgstr "Nem sikerรผlt elรฉrni a CD-ROM-ot."
 msgid "Problem closing the gzip file %s"
 msgstr "Hiba a(z) %s gzip fรกjl bezรกrรกsakor"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nem lesz zรกrolva a(z) โ€ž%sโ€ csak olvashatรณ zรกrolรกsi fรกjl"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s zรกrolรกsi fรกjl nem nyithatรณ meg"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nem lesz zรกrolva a(z) %s NFS-csatolรกsรบ zรกrolรกsi fรกjl"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nem sikerรผlt zรกrolni: %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "A fรกjlok listรกjรกt nem lehetett lรฉtrehozni, mert โ€ž%sโ€ nem kรถnyvtรกr"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "โ€ž%sโ€ figyelmen kรญvรผl hagyรกsa a(z) โ€ž%sโ€ kรถnyvtรกrban, mert nem szabรกlyos fรกjl"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "โ€ž%sโ€ fรกjl figyelmen kรญvรผl hagyรกsa a(z) โ€ž%sโ€ kรถnyvtรกrban, mert nincs "
 "fรกjlkiterjesztรฉse"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2534,73 +2571,79 @@ msgstr ""
 "โ€ž%sโ€ fรกjl figyelmen kรญvรผl hagyรกsa a(z) โ€ž%sโ€ kรถnyvtรกrban, mert รฉrvรฉnytelen "
 "fรกjlkiterjesztรฉse van"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s alfolyamat szegmentรกlรกsi hibรกt okozott."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "A(z) %s alfolyamat %u szรกmรบ szignรกlt kapott."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s alfolyamat hibakรณddal tรฉrt vissza (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s alfolyamat vรกratlanul kilรฉpett"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nem lehet megnyitni a(z) %s fรกjlt"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nem lehet megnyitni a(z) %d fรกjlleรญrรณt"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Nem sikerรผlt az alfolyamat IPC-t lรฉtrehozni"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Nem sikerรผlt elindรญtani a tรถmรถrรญtล‘t "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "olvasรกs, mรฉg kellene %llu, de mรกr az รถsszes elfogyott"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "รญrรกs, mรฉg kiรญrandรณ %llu, de ez nem lehetsรฉges"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Hiba a(z) %s fรกjl bezรกrรกsakor"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Hiba a(z) %s fรกjl รกtnevezรฉsekor erre: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Hiba a(z) %s fรกjl tรถrlรฉsekor"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Hiba a fรกjl szinkronizรกlรกsakor"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nincs kulcstartรณ telepรญtve ide: %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "รœres csomaggyorsรญtรณtรกr"
@@ -2626,59 +2669,59 @@ msgstr "Ez az APT nem tรกmogatja a(z) โ€ž%sโ€ verziรณrendszert"
 msgid "The package cache was built for a different architecture"
 msgstr "A csomaggyorsรญtรณtรกr egy mรกsik architektรบrรกhoz kรฉszรผlt"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Fรผgg ettล‘l"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Fรผgg ettล‘l (elล‘fรผggรฉs)"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Javasolja"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Ajรกnlja"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "รœtkรถzik"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Kicserรฉli"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Elavulttรก teszi"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Tรถri"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Bล‘vรญti"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "fontos"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "szรผksรฉges"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "szabvรกnyos"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcionรกlis"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2788,17 +2831,17 @@ msgstr "%s megnyitรกsa"
 msgid "Line %u too long in source list %s."
 msgstr "A(z) %u. sor tรบl hosszรบ a(z) %s forrรกslistรกban."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "A(z) %u. sor hibรกs a(z) %s forrรกslistรกban (tรญpus)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "โ€ž%1$sโ€ tรญpus nem ismert a(z) %3$s forrรกslista %2$u. sorรกban"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2807,12 +2850,12 @@ msgstr ""
 "Nem lehetett a(z) โ€ž%sโ€ kรถzvetlen beรกllรญtรกsรกt vรฉgrehajtani. A rรฉszletekรฉrt "
 "lรกsd a man 5 apt.conf oldalt az APT::Immediate-Configure cรญmszรณ alatt. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "A(z) โ€ž%sโ€ beรกllรญtรกsa sikertelen"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2835,7 +2878,7 @@ msgid ""
 msgstr ""
 "A(z) %s csomagot รบjra kell telepรญteni, de nem talรกlhatรณ hozzรก archรญvum."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2843,11 +2886,11 @@ msgstr ""
 "Hiba, a pkgProblemResolver::Resolve tรถrรฉseket generรกlt, ezt visszafogott "
 "csomagok okozhatjรกk."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "A problรฉmรกk nem javรญthatรณk, sรฉrรผlt csomagokat fogott vissza."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2855,7 +2898,7 @@ msgstr ""
 "Nรฉhรกny indexfรกjlt nem sikerรผlt letรถlteni. Figyelmen kรญvรผl lettek hagyva, "
 "vagy rรฉgebbiek lettek felhasznรกlva."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "A(z) %spartial listakรถnyvtรกr hiรกnyzik."
@@ -2892,19 +2935,19 @@ msgstr "A(z) %s metรณdusvezรฉrlล‘ nem talรกlhatรณ."
 msgid "Method %s did not start correctly"
 msgstr "A(z) %s metรณdus nem indult el megfelelล‘en"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Helyezze be a(z) โ€ž%sโ€ cรญmkรฉjลฑ lemezt a(z) โ€ž%sโ€ meghajtรณba, รฉs nyomja meg az "
 "Entert."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "A(z) โ€ž%sโ€ csomagrendszer nem tรกmogatott"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "A megfelelล‘ csomagrendszertรญpus nem hatรกrozhatรณ meg"
 
@@ -2961,14 +3004,14 @@ msgstr "A gyorsรญtรณtรกrnak inkompatibilis verziรณrendszere van"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Hiba tรถrtรฉnt a(z) %s feldolgozรกsa sorรกn (%s%d)"
@@ -2989,29 +3032,29 @@ msgstr "Az APT รกltal kezelhetล‘ csomagleรญrรกsok szรกma tรบllรฉpve."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Az APT รกltal kezelhetล‘ fรผggล‘sรฉgek szรกma tรบllรฉpve."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "A(z) %s %s csomag nem volt megtalรกlhatรณ a fรกjl fรผggล‘sรฉgeinek feldolgozรกsa "
 "kรถzben"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nem lehet a(z) %s forrรกs csomaglistรกjรกt elรฉrni"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Csomaglistรกk olvasรกsa"
 
 # FIXME
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "โ€žBiztosรญtjaโ€ kapcsolatok รถsszegyลฑjtรฉse"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO hiba a forrรกs-gyorsรญtรณtรกr mentรฉsekor"
 
@@ -3024,12 +3067,12 @@ msgstr "sikertelen รกtnevezรฉs, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Az MD5Sum nem megfelelล‘"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "A Hash Sum nem megfelelล‘"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3038,16 +3081,16 @@ msgstr ""
 "A vรกrt โ€ž%sโ€ bejegyzรฉs nem talรกlhatรณ a Release fรกjlban (Rossz sources.list "
 "bejegyzรฉs vagy helytelenรผl formรกzott fรกjl)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nem talรกlhatรณ a(z) โ€ž%sโ€ ellenล‘rzล‘รถsszege a Release fรกjlban"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nem รฉrhetล‘ el nyilvรกnos kulcs az alรกbbi kulcsazonosรญtรณkhoz:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3056,27 +3099,27 @@ msgstr ""
 "A Release fรกjl elavult ehhez: %s (รฉrvรฉnytelen ez รณta: %s). A tรกrolรณ "
 "frissรญtรฉsei nem kerรผlnek alkalmazรกsra."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "รœtkรถzล‘ disztribรบciรณ: %s (a vรกrt %s helyett %s รฉrkezett)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Hiba tรถrtรฉnt az alรกรญrรกs ellenล‘rzรฉse kรถzben. A tรกrolรณ nem frissรผlt, รฉs az "
 "elล‘zล‘ indexfรกjl lesz hasznรกlva. GPG hiba: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG hiba: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,7 +3128,7 @@ msgstr ""
 "Egy fรกjl nem talรกlhatรณ a(z) %s csomaghoz. Ez azt jelentheti, hogy kรฉzzel "
 "kell kijavรญtani a csomagot. (hiรกnyzรณ arch. miatt)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3094,38 +3137,38 @@ msgstr ""
 "Egy fรกjl nem talรกlhatรณ a(z) %s csomaghoz. Ez azt jelentheti, hogy kรฉzzel "
 "kell kijavรญtani a csomagot."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "A csomagindexfรกjlok megsรฉrรผltek. Nincs Filename: mezล‘ a(z) %s csomaghoz."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "A mรฉret nem megfelelล‘"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "A(z) %s Release fรกjl nem dolgozhatรณ fel"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "A(z) %s Release fรกjl nem tartalmaz szakaszokat"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Nincs Hash bejegyzรฉs a(z) %s Release fรกjlban"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ร‰rvรฉnytelen โ€žValid-Untilโ€ bejegyzรฉs a(z) %s Release fรกjlban"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ร‰rvรฉnytelen โ€žDateโ€ bejegyzรฉs a(z) %s Release fรกjlban"
@@ -3153,7 +3196,7 @@ msgstr "Azonosรญtรกs... "
 msgid "Stored label: %s\n"
 msgstr "Tรกrolt cรญmke: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM levรกlasztรกsa...\n"
 
@@ -3217,30 +3260,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Csomaglistรกk mรกsolรกsa..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "รšj forrรกslista รญrรกsa\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "A lemezhez tartozรณ forrรกslistabejegyzรฉsek a kรถvetkezล‘k:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rekord kiรญrva.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i rekord kiรญrva, %i hiรกnyzรณ fรกjllal.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i rekord kiรญrva %i eltรฉrล‘ fรกjllal\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i rekord kiรญrva %i hiรกnyzรณ รฉs %i eltรฉrล‘ fรกjllal\n"
@@ -3255,17 +3298,6 @@ msgstr "%s hitelesรญtรฉsi rekordja nem talรกlhatรณ"
 msgid "Hash mismatch for: %s"
 msgstr "%s ellenล‘rzล‘รถsszege nem megfelelล‘"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "A(z) %s fรกjl nem digitรกlisan alรกรญrt รผzenettel kezdล‘dik"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nincs kulcstartรณ telepรญtve ide: %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3334,114 +3366,114 @@ msgstr "Felkรฉszรผlรฉs megoldรกs fogadรกsรกra"
 msgid "External solver failed without a proper error message"
 msgstr "A kรผlsล‘ solver megfelelล‘ hibaรผzenet nรฉlkรผl hibรกzott"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Kรผlsล‘ solver vรฉgrehajtรกsa"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s telepรญtรฉse"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfigurรกlรกsa"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltรกvolรญtรกsa"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s teljes eltรกvolรญtรกsa"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "โ€ž%sโ€ eltลฑnรฉse feljegyezve"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A(z) %s telepรญtรฉs utรกni trigger futtatรกsa"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "A(z) โ€ž%sโ€ kรถnyvtรกr hiรกnyzik"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "A(z) โ€ž%sโ€ fรกjl megnyitรกsa sikertelen"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s elล‘kรฉszรญtรฉse"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolรกsa"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfigurรกlรกsรกnak elล‘kรฉszรญtรฉse"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s telepรญtve"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s eltรกvolรญtรกsรกnak elล‘kรฉszรญtรฉse"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s eltรกvolรญtva"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s teljes eltรกvolรญtรกsรกnak elล‘kรฉszรญtรฉse"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltรกvolรญtva"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nem รญrhatรณ a naplรณ, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "A dpkg futtatรกsa"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "A mลฑvelet megszakadt, mielล‘tt befejezล‘dhetett volna"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nem kerรผlt รญrรกsra apport jelentรฉs, mivel a MaxReports mรกr elรฉrve"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "fรผggล‘sรฉgi hibรกk - a csomag beรกllรญtatlan maradt"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3449,7 +3481,7 @@ msgstr ""
 "Nem kerรผlt kiรญrรกsra apport jelentรฉs, mivel a hibaรผzenet szerint ez a hiba "
 "egy korรกbbi hiba kรถvetkezmรฉnye."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3465,15 +3497,7 @@ msgstr ""
 "Nem kerรผlt kiรญrรกsra apport jelentรฉs, mivel a hibaรผzenet memรณriaelfogyรกsi "
 "hibรกt jelez"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nem kerรผlt kiรญrรกsra apport jelentรฉs, mert a hibaรผzenet a helyi rendszeren "
-"lรฉvล‘ hibรกt jelez"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3508,20 +3532,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nincs zรกrolva"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Hiba tรถrtรฉnt โ€ž%s:%sโ€ feloldรกsakor (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Kรฉsz"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Hiba tรถrtรฉnt az alรกรญrรกs ellenล‘rzรฉse kรถzben. A tรกrolรณ nem frissรผlt, รฉs az "
-#~ "elล‘zล‘ indexfรกjl lesz hasznรกlva. GPG hiba: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "A(z) %s fรกjl nem digitรกlisan alรกรญrt รผzenettel kezdล‘dik"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "A nem lรฉtezล‘ %s fรกjl kihagyรกsa"
@@ -3659,3 +3671,10 @@ msgstr "Nincs zรกrolva"
 
 #~ msgid "Error occurred while processing %s (CollectFileProvides)"
 #~ msgstr "Hiba tรถrtรฉnt %s feldolgozรกsakor (CollectFileProvides)"
+
+#~ msgid ""
+#~ "No apport report written because the error message indicates an issue on "
+#~ "the local system"
+#~ msgstr ""
+#~ "Nem kerรผlt kiรญrรกsra apport jelentรฉs, mert a hibaรผzenet a helyi rendszeren "
+#~ "lรฉvล‘ hibรกt jelez"
diff --git a/po/it.po b/po/it.po
index 73cd5ece5..216616a48 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-25 21:54+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -98,74 +98,74 @@ msgstr "Totale spazio occupato: "
 msgid "Package file %s is out of sync."
 msgstr "Il file dei pacchetti %s non รจ sincronizzato."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nessun pacchetto trovato"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "รˆ necessario specificare almeno un modello per la ricerca"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Questo comando รจ deprecato. Utilizzare \"apt-mark showauto\" al suo posto."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "La cache non รจ sincronizzata, impossibile referenziare un file di pacchetti"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(non trovato)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per %s compilato il %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,20 +238,28 @@ msgstr ""
 "Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n"
 "apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inserire un disco nell'unitร  e premere Invio"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Mount di \"%s\" su \"%s\" non riuscito"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ripetere questo processo per il resto dei CD."
 
@@ -490,7 +498,7 @@ msgstr "La reinstallazione di %s non รจ possibile, non puรฒ essere scaricato.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s รจ giร  alla versione piรน recente.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "รˆ stato impostato %s per l'installazione manuale.\n"
@@ -601,8 +609,8 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero in %s"
@@ -643,7 +651,7 @@ msgstr "Interrotto."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Continuare [S/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossibile recuperare %s  %s\n"
@@ -652,7 +660,7 @@ msgstr "Impossibile recuperare %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalitร  solo scaricamento"
 
@@ -737,7 +745,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
 
@@ -792,7 +800,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -804,33 +812,33 @@ msgstr ""
 "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
 "non sono ancora stati creati o sono stati rimossi da Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pacchetti danneggiati"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s impostato automaticamente come installato.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -838,48 +846,48 @@ msgstr ""
 "Questo comando รจ deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual"
 "\" al suo posto."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Eseguito"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Impossibile bloccare la directory di scaricamento"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Scaricamento di %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "รˆ necessario specificare almeno un pacchetto di cui recuperare il sorgente"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -889,7 +897,7 @@ msgstr ""
 "all'interno del sistema di controllo della versione \"%s\" presso:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -901,70 +909,70 @@ msgstr ""
 "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" giร  scaricato viene saltato\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Lo spazio libero in %s รจ insufficiente"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "รˆ necessario recuperare %sB/%sB di sorgenti.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "รˆ necessario scaricare %sB di sorgenti.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Estrazione del pacchetto sorgente giร  estratto in %s saltata\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "รˆ necessario specificare almeno un pacchetto di cui controllare le "
 "dipendenze di generazione"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -973,17 +981,17 @@ msgstr ""
 "Informazioni sull'architettura non disponibili per %s. Consultare apt.conf"
 "(5) APT::Architectures per l'impostazione"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -992,7 +1000,7 @@ msgstr ""
 "La dipendenza %s per %s non puรฒ essere soddisfatta perchรฉ %s non รจ "
 "consentito su pacchetti \"%s\""
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1001,14 +1009,14 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perchรฉ il pacchetto %s "
 "non puรฒ essere trovato"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "La dipendenza %s per %s non รจ stata soddisfatta: il pacchetto installato %s "
 "รจ troppo recente"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1017,7 +1025,7 @@ msgstr ""
 "La dipendenza %s per %s non puรฒ essere soddisfatta perchรฉ la versione "
 "candidata del pacchetto %s non puรฒ soddisfare i requisiti di versione"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1026,30 +1034,30 @@ msgstr ""
 "La dipendenza %s per %s non puรฒ essere soddisfatta perchรฉ il pacchetto %s "
 "non ha una versione candidata"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "La dipendenza %s per %s non รจ stata soddisfatta: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog per %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1139,7 +1147,7 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5).\n"
 "                       Questo APT ha i poteri della Super Mucca.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1215,7 +1223,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s era giร  non bloccato.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "In attesa di %s ma non era presente"
@@ -1375,8 +1384,8 @@ msgstr "Connessione scaduta"
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Errore di lettura"
 
@@ -1389,8 +1398,8 @@ msgid "Protocol corruption"
 msgstr "Protocollo danneggiato"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Errore di scrittura"
 
@@ -1445,7 +1454,7 @@ msgstr "Connessione al socket dati terminata"
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Si รจ verificato un problema nel creare l'hash del file"
 
@@ -1472,90 +1481,104 @@ msgstr "Interrogazione"
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connessione a %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Impossibile connettersi a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Impossibile risolvere \"%s\""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr ""
+"Si รจ verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 "Si รจ verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossibile connettersi a %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Errore interno: firma corretta, ma non รจ possibile determinare l'impronta "
 "della chiave."
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "รˆ stata trovata almeno una firma non valida."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non รจ "
 "installato)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1595,53 +1618,53 @@ msgstr "Questo server HTTP ha un supporto del range non corretto"
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Errore interno"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
@@ -1668,7 +1691,12 @@ msgstr "Nessun file mirror \"%s\" trovato "
 msgid "Can not read mirror file '%s'"
 msgstr "Impossibile leggere il file mirror \"%s\""
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Impossibile leggere il file mirror \"%s\""
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Mirror: %s]"
@@ -1769,7 +1797,7 @@ msgstr ""
 "  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossibile scrivere in %s"
@@ -1915,8 +1943,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossibile aprire il file del database %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossibile eseguire stat su %s"
@@ -1932,87 +1960,87 @@ msgstr "Impossibile ottenere un cursore"
 # (ndt) messo A per Avviso
 # Inizio con la maiuscola dopo i : perchรฉ mi sa che in molti
 # casi molte stringhe sono cosรฌ
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Impossibile leggere la directory %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Impossibile eseguire stat su %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Gli errori si applicano al file "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Risoluzione di %s non riuscita"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Visita dell'albero non riuscita"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Apertura di %s non riuscita"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Delink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Esecuzione di readlink su %s non riuscita"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Esecuzione di unlink su %s non riuscita"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Collegamento di %s a %s non riuscito"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Raggiunto il limite di DeLink di %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "L'archivio non ha un campo \"package\""
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ha un campo override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  il responsabile di %s รจ %s non %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ha un campo source override\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s non ha neppure un campo binario override\n"
@@ -2086,7 +2114,7 @@ msgstr "Lettura durante l'elaborazione MD5 non riuscita"
 msgid "Problem unlinking %s"
 msgstr "Problema nell'unlink di %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Rinomina di %s in %s non riuscita"
@@ -2143,23 +2171,23 @@ msgstr ""
 "  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Creazione delle pipe non riuscita"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Esecuzione di gzip non riuscita "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Archivio danneggiato"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Checksum di tar non riuscito, archivio danneggiato"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
@@ -2230,55 +2258,55 @@ msgstr "Scrittura del file %s non riuscita"
 msgid "Failed to close file %s"
 msgstr "Chiusura del file %s non riuscita"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Il percorso %s รจ troppo lungo"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Estrazione di %s eseguita piรน di una volta"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "La directory %s รจ deviata"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 "Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Il percorso della deviazione รจ troppo lungo"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "La directory %s sta per essere sostituita da una non-directory"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Il percorso รจ troppo lungo"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossibile eseguire stat su %s"
@@ -2362,30 +2390,30 @@ msgstr ""
 "ridimensionamento automatico รจ stato disabilitato dall'utente."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lig %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
@@ -2460,6 +2488,16 @@ msgstr "%c%s... Errore"
 msgid "%c%s... Done"
 msgstr "%c%s... Fatto"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fatto"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2522,46 +2560,46 @@ msgstr "Esecuzione di stat sul CD-ROM non riuscita"
 msgid "Problem closing the gzip file %s"
 msgstr "Si รจ verificato un problema nel chiudere il file gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossibile aprire il file di blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossibile impostare il blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 "L'elenco dei file non puรฒ essere creato poichรฉ \"%s\" non รจ una directory"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "Viene ignorato \"%s\" nella directory \"%s\" poichรฉ non รจ un file regolare"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Viene ignorato il file \"%s\" nella directory \"%s\" poichรฉ non ha "
 "un'estensione"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2569,73 +2607,79 @@ msgstr ""
 "Viene ignorato il file \"%s\" nella directory \"%s\" poichรฉ ha un'estensione "
 "non valida"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Il sottoprocesso %s รจ uscito inaspettatamente"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossibile aprire il descrittore del file %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Creazione di un sottoprocesso IPC non riuscita"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Esecuzione non riuscita del compressore "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lettura, ancora %llu da leggere, ma non รจ stato trovato nulla"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "scrittura, ancora %llu da scrivere, ma non รจ possibile"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Si รจ verificato un problema nel chiudere il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Si รจ verificato un problema nel rinominare il file %s in %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Si รจ verificato un problema nell'eseguire l'unlink del file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Si รจ verificato un problema nel sincronizzare il file"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nessun portachiavi installato in %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache dei pacchetti vuota"
@@ -2662,59 +2706,59 @@ msgid "The package cache was built for a different architecture"
 msgstr ""
 "Il file della cache dei pacchetti รจ stato generato per un'altra architettura"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Dipende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Pre-dipende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Migliora"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "richiesto"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opzionale"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2824,17 +2868,17 @@ msgstr "Apertura di %s"
 msgid "Line %u too long in source list %s."
 msgstr "Riga %u troppo lunga nel file %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "La riga %u nel file %s non รจ corretta (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2844,12 +2888,12 @@ msgstr ""
 "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
 "Immediate-Configure\" (%d)."
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Impossibile configurare \"%s\". "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2874,7 +2918,7 @@ msgstr ""
 "Il pacchetto %s deve essere reinstallato, ma non รจ possibile trovarne un "
 "archivio."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2882,12 +2926,12 @@ msgstr ""
 "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
 "potrebbe essere causato da pacchetti bloccati."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2896,7 +2940,7 @@ msgstr ""
 "usati quelli vecchi."
 
 # (ndt) sarebbe da controllare meglio assieme a quella dopo
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Manca la directory di liste %spartial."
@@ -2933,17 +2977,17 @@ msgstr "Impossibile trovare un driver per il metodo %s."
 msgid "Method %s did not start correctly"
 msgstr "Il metodo %s non si รจ avviato correttamente"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inserire il disco chiamato \"%s\" nell'unitร  \"%s\" e premere Invio."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Il sistema di pacchetti \"%s\" non รจ supportato"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
@@ -3003,14 +3047,14 @@ msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Si รจ verificato un errore nell'elaborare %s (%s%d)"
@@ -3033,29 +3077,29 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "รˆ stato superato il numero di dipendenze che questo APT puรฒ gestire."
 
 # (ndt) il primo รจ il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Il pacchetto %s v.%s non รจ stato trovato durante l'elaborazione delle "
 "dipendenze"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lettura elenco dei pacchetti"
 
 # (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Il file fornisce"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Errore di I/O nel salvare la cache sorgente"
 
@@ -3068,12 +3112,12 @@ msgstr "rename() non riuscita: %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5sum non corrispondente"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Somma hash non corrispondente"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3082,17 +3126,17 @@ msgstr ""
 "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
 "errata o file danneggiato)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Non รจ disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3101,27 +3145,27 @@ msgstr ""
 "Il file Release per %s รจ scaduto (non valido dal %s). Gli aggiornamenti per "
 "questo repository non verranno applicati."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Si รจ verificato un errore nel verificare la firma. Il repository non รจ "
 "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Errore GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,7 +3174,7 @@ msgstr ""
 "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
 "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3140,7 +3184,7 @@ msgstr ""
 "correggere manualmente questo pacchetto."
 
 # (ndt) sarebbe da controllare se veramente possono esistere piรน file indice
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3148,31 +3192,31 @@ msgstr ""
 "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
 "per il pacchetto %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Le dimensioni non corrispondono"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossibile analizzare il file Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Nessuna sezione nel file Release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Nessuna voce Hash nel file Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Voce \"Date\" nel file Release %s non valida"
@@ -3200,7 +3244,7 @@ msgstr "Identificazione... "
 msgid "Stored label: %s\n"
 msgstr "Etichette archiviate: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Smontaggio CD-ROM...\n"
 
@@ -3264,30 +3308,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copia elenco pacchetti..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Scrittura nuovo elenco sorgenti\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Scritti %i record.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Scritti %i record con %i file mancanti.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Scritti %i record con %i file senza corrispondenze\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3303,17 +3347,6 @@ msgstr "Impossibile trovare il record di autenticazione per %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash non corrispondente per %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nessun portachiavi installato in %s."
-
 # (ndt) dovrebbe essere inteso il file Release
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3389,117 +3422,117 @@ msgstr "Preparazione alla ricezione della soluzione"
 msgid "External solver failed without a proper error message"
 msgstr "Il solver esterno รจ terminato senza un errore di messaggio"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Esecuzione solver esterno"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Notata la sparizione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Esecuzione comando di post installazione %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossibile aprire il file \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
 "รจ montato)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Esecuzione di dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "L'operazione รจ stata interrotta prima di essere completata"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Segnalazione apport non scritta poichรฉ รจ stato raggiunto il valore massimo "
 "di MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3507,7 +3540,7 @@ msgstr ""
 "Segnalazione apport non scritta poichรฉ il messaggio di errore indica la "
 "presenza di un fallimento precedente."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3523,15 +3556,7 @@ msgstr ""
 "Segnalazione apport non scritta poichรฉ il messaggio di errore indica un "
 "errore di memoria esaurita"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Non รจ stata scritta alcuna segnalazione di apport poichรฉ il messaggio di "
-"errore indica la presenza di un problema nel sistema locale"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3568,22 +3593,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloccato"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr ""
-#~ "Si รจ verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - "
-#~ "%s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Fatto"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Si รจ verificato un errore nel verificare la firma. Il repository non รจ "
-#~ "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Saltato il file inesistente %s"
@@ -3663,6 +3674,13 @@ msgstr "Non bloccato"
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "Ricevuta una singola riga header su %u caratteri"
 
+#~ msgid ""
+#~ "No apport report written because the error message indicates an issue on "
+#~ "the local system"
+#~ msgstr ""
+#~ "Non รจ stata scritta alcuna segnalazione di apport poichรฉ il messaggio di "
+#~ "errore indica la presenza di un problema nel sistema locale"
+
 #~ msgid "Malformed override %s line %lu #1"
 #~ msgstr "Override non corretto: file %s riga %lu #1"
 
diff --git a/po/ja.po b/po/ja.po
index a9c3db129..20a1162bc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-07-01 00:14+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -96,73 +96,73 @@ msgstr "็ทๅ ๆœ‰ๅฎน้‡: "
 msgid "Package file %s is out of sync."
 msgstr "Package ใƒ•ใ‚กใ‚คใƒซ %s ใŒๅŒๆœŸใ—ใฆใ„ใพใ›ใ‚“ใ€‚"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "ๆคœ็ดขใƒ‘ใ‚ฟใƒผใƒณใฏใกใ‚‡ใ†ใฉ 1 ใคใ ใ‘ๆŒ‡ๅฎšใ—ใฆใใ ใ•ใ„"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "ใ“ใฎใ‚ณใƒžใƒณใƒ‰ใฏๆ™‚ไปฃ้…ใ‚Œใงใ™ใ€‚'apt-mark showauto' ใ‚’ไปฃใ‚ใ‚Šใซไฝฟ็”จใ—ใฆใใ ใ•ใ„ใ€‚"
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒ•ใ‚กใ‚คใƒซ:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ใ‚ญใƒฃใƒƒใ‚ทใƒฅใŒๅŒๆœŸใ—ใฆใŠใ‚‰ใšใ€ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒ•ใ‚กใ‚คใƒซใ‚’็›ธไบ’ๅ‚็…งใงใใพใ›ใ‚“"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pin ใ•ใ‚ŒใŸใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚Œใฆใ„ใ‚‹ใƒใƒผใ‚ธใƒงใƒณ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ๅ€™่ฃœ: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ใชใ—)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ใƒใƒผใ‚ธใƒงใƒณใƒ†ใƒผใƒ–ใƒซ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s ใ‚ณใƒณใƒ‘ใ‚คใƒซๆ—ฅๆ™‚: %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -232,20 +232,28 @@ msgstr ""
 "  -o=? ๆŒ‡ๅฎšใ—ใŸ่จญๅฎšใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’่ชญใฟ่พผใ‚€ (ไพ‹: -o dir::cache=/tmp)\n"
 "่ฉณ็ดฐใฏใ€apt-cache(8) ใ‚„ apt.conf(5) ใฎใƒžใƒ‹ใƒฅใ‚ขใƒซใƒšใƒผใ‚ธใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "ใ“ใฎใƒ‡ใ‚ฃใ‚นใ‚ฏใซใ€'Debian 5.0.3 Disk 1' ใฎใ‚ˆใ†ใชๅๅ‰ใ‚’ไป˜ใ‘ใฆใใ ใ•ใ„"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ใƒ‡ใ‚ฃใ‚นใ‚ฏใ‚’ใƒ‰ใƒฉใ‚คใƒ–ใซๅ…ฅใ‚Œใฆ Enter ใ‚ญใƒผใ‚’ๆŠผใ—ใฆใใ ใ•ใ„"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "'%s' ใ‚’ '%s' ใซใƒžใ‚ฆใƒณใƒˆใงใใพใ›ใ‚“ใงใ—ใŸ"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "ใ‚ใชใŸใฎๆŒใฃใฆใ„ใ‚‹ CD ใ‚ปใƒƒใƒˆใฎๆฎ‹ใ‚Šๅ…จ้ƒจใซใ€ใ“ใฎๆ‰‹้ †ใ‚’็นฐใ‚Š่ฟ”ใ—ใฆใใ ใ•ใ„ใ€‚"
@@ -485,7 +493,7 @@ msgstr "ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใงใใชใ„ใŸใ‚ใ€%s ใฎๅ†ใ‚คใƒณใ‚นใƒˆใƒผใƒซใฏไธ
 msgid "%s is already the newest version.\n"
 msgstr "%s ใฏใ™ใงใซๆœ€ๆ–ฐใƒใƒผใ‚ธใƒงใƒณใงใ™ใ€‚\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ใฏๆ‰‹ๅ‹•ใงใ‚คใƒณใ‚นใƒˆใƒผใƒซใ—ใŸใจ่จญๅฎšใ•ใ‚Œใพใ—ใŸใ€‚\n"
@@ -595,8 +603,8 @@ msgstr "ใ“ใฎๆ“ไฝœๅพŒใซ่ฟฝๅŠ ใง %sB ใฎใƒ‡ใ‚ฃใ‚นใ‚ฏๅฎน้‡ใŒๆถˆ่ฒปใ•ใ‚Œใพใ
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ใ“ใฎๆ“ไฝœๅพŒใซ %sB ใฎใƒ‡ใ‚ฃใ‚นใ‚ฏๅฎน้‡ใŒ่งฃๆ”พใ•ใ‚Œใพใ™ใ€‚\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s ใฎ็ฉบใ้ ˜ๅŸŸใ‚’ๆธฌๅฎšใงใใพใ›ใ‚“"
@@ -635,7 +643,7 @@ msgstr "ไธญๆ–ญใ—ใพใ—ใŸใ€‚"
 msgid "Do you want to continue [Y/n]? "
 msgstr "็ถš่กŒใ—ใพใ™ใ‹ [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s ใฎๅ–ๅพ—ใซๅคฑๆ•—ใ—ใพใ—ใŸ  %s\n"
@@ -644,7 +652,7 @@ msgstr "%s ใฎๅ–ๅพ—ใซๅคฑๆ•—ใ—ใพใ—ใŸ  %s\n"
 msgid "Some files failed to download"
 msgstr "ใ„ใใคใ‹ใฎใƒ•ใ‚กใ‚คใƒซใฎๅ–ๅพ—ใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ‚ชใƒณใƒชใƒผใƒขใƒผใƒ‰ใงใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฎใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใŒๅฎŒไบ†ใ—ใพใ—ใŸ"
 
@@ -726,7 +734,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ไปฅไธ‹ใฎๆƒ…ๅ ฑใŒใ“ใฎๅ•้กŒใ‚’่งฃๆฑบใ™ใ‚‹ใŸใ‚ใซๅฝน็ซ‹ใคใ‹ใ‚‚ใ—ใ‚Œใพใ›ใ‚“:"
 
@@ -775,7 +783,7 @@ msgstr ""
 "ๆœช่งฃๆฑบใฎไพๅญ˜้–ขไฟ‚ใงใ™ใ€‚'apt-get -f install' ใ‚’ๅฎŸ่กŒใ—ใฆใฟใฆใใ ใ•ใ„ (ใพใŸใฏ่งฃๆณ•"
 "ใ‚’ๆ˜Ž็คบใ—ใฆใใ ใ•ใ„)ใ€‚"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -787,33 +795,33 @@ msgstr ""
 "ใงใ‚ใ‚Œใฐ) ๅฟ…่ฆใชใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒใพใ ไฝœๆˆใ•ใ‚Œใฆใ„ใชใ‹ใฃใŸใ‚Š Incoming ใ‹ใ‚‰็งป\n"
 "ๅ‹•ใ•ใ‚Œใฆใ„ใชใ„ใ“ใจใŒ่€ƒใˆใ‚‰ใ‚Œใพใ™ใ€‚"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ๅฃŠใ‚ŒใŸใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ไปฅไธ‹ใฎ็‰นๅˆฅใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚Œใพใ™:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ๆๆกˆใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ๆŽจๅฅจใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ใฏ่‡ชๅ‹•ใงใ‚คใƒณใ‚นใƒˆใƒผใƒซใ—ใŸใจ่จญๅฎšใ•ใ‚Œใพใ—ใŸใ€‚\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -821,47 +829,47 @@ msgstr ""
 "ใ“ใฎใ‚ณใƒžใƒณใƒ‰ใฏๆ™‚ไปฃ้…ใ‚Œใงใ™ใ€‚'apt-mark auto' ใŠใ‚ˆใณ 'apt-mark manual' ใ‚’ไปฃใ‚ใ‚Š"
 "ใซไฝฟ็”จใ—ใฆใใ ใ•ใ„ใ€‚"
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ใ‚ขใƒƒใƒ—ใ‚ฐใƒฌใƒผใƒ‰ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’ๆคœๅ‡บใ—ใฆใ„ใพใ™ ... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ๅคฑๆ•—"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ๅฎŒไบ†"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ๅ†…้ƒจใ‚จใƒฉใƒผใ€ๅ•้กŒใƒชใ‚พใƒซใƒใŒไฝ•ใ‹ใ‚’็ ดๅฃŠใ—ใพใ—ใŸ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒชใ‚’ใƒญใƒƒใ‚ฏใงใใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' ใฎใƒใƒผใ‚ธใƒงใƒณ '%1$s' ใ‚’ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ™ใ‚‹ใ‚ฝใƒผใ‚นใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "%s %s ใ‚’ใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ—ใฆใ„ใพใ™"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ใ‚ฝใƒผใ‚นใ‚’ๅ–ๅพ—ใ™ใ‚‹ใซใฏๅฐ‘ใชใใจใ‚‚ 1 ใคใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธๅใ‚’ๆŒ‡ๅฎšใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s ใฎใ‚ฝใƒผใ‚นใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -871,7 +879,7 @@ msgstr ""
 "ใพใ™:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -883,70 +891,70 @@ msgstr ""
 "bzr branch %s\n"
 "ใ‚’ไฝฟ็”จใ—ใฆใใ ใ•ใ„ใ€‚\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ใ™ใงใซใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใ•ใ‚ŒใŸใƒ•ใ‚กใ‚คใƒซ '%s' ใ‚’ใ‚นใ‚ญใƒƒใƒ—ใ—ใพใ™\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s ใซๅ……ๅˆ†ใช็ฉบใใ‚นใƒšใƒผใ‚นใŒใ‚ใ‚Šใพใ›ใ‚“"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB ไธญ %1$sB ใฎใ‚ฝใƒผใ‚นใ‚ขใƒผใ‚ซใ‚คใƒ–ใ‚’ๅ–ๅพ—ใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB ใฎใ‚ฝใƒผใ‚นใ‚ขใƒผใ‚ซใ‚คใƒ–ใ‚’ๅ–ๅพ—ใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ใ‚ฝใƒผใ‚น %s ใ‚’ๅ–ๅพ—\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ใ„ใใคใ‹ใฎใ‚ขใƒผใ‚ซใ‚คใƒ–ใฎๅ–ๅพ—ใซๅคฑๆ•—ใ—ใพใ—ใŸใ€‚"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "ใ™ใงใซ %s ใซๅฑ•้–‹ใ•ใ‚ŒใŸใ‚ฝใƒผใ‚นใŒใ‚ใ‚‹ใŸใ‚ใ€ๅฑ•้–‹ใ‚’ใ‚นใ‚ญใƒƒใƒ—ใ—ใพใ™\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ๅฑ•้–‹ใ‚ณใƒžใƒณใƒ‰ '%s' ใŒๅคฑๆ•—ใ—ใพใ—ใŸใ€‚\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚Œใฆใ„ใ‚‹ใ“ใจใ‚’็ขบ่ชใ—ใฆใใ ใ•ใ„ใ€‚\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ใƒ“ใƒซใƒ‰ใ‚ณใƒžใƒณใƒ‰ '%s' ใŒๅคฑๆ•—ใ—ใพใ—ใŸใ€‚\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ๅญใƒ—ใƒญใ‚ปใ‚นใŒๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ใƒ“ใƒซใƒ‰ไพๅญ˜้–ขไฟ‚ใ‚’ใƒใ‚งใƒƒใ‚ฏใ™ใ‚‹ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’ๅฐ‘ใชใใจใ‚‚ 1 ใคๆŒ‡ๅฎšใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -955,17 +963,17 @@ msgstr ""
 "%s ใซๅˆฉ็”จๅฏ่ƒฝใชใ‚ขใƒผใ‚ญใƒ†ใ‚ฏใƒใƒฃๆƒ…ๅ ฑใŒใ‚ใ‚Šใพใ›ใ‚“ใ€‚ใ‚ปใƒƒใƒˆใ‚ขใƒƒใƒ—ใฎใŸใ‚ใซ apt.conf"
 "(5) ใฎ APT::Architectures ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s ใฎใƒ“ใƒซใƒ‰ไพๅญ˜ๆƒ…ๅ ฑใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ใซใฏใƒ“ใƒซใƒ‰ไพๅญ˜ๆƒ…ๅ ฑใŒๆŒ‡ๅฎšใ•ใ‚Œใฆใ„ใพใ›ใ‚“ใ€‚\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -974,7 +982,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %3$s ใŒ '%4$s' ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใง่จฑใ•ใ‚Œใฆใ„ใชใ„ใŸใ‚ใ€%2$s ใซๅฏพใ™ใ‚‹ %1$s "
 "ใฎไพๅญ˜้–ขไฟ‚ใ‚’ๆบ€ใŸใ™ใ“ใจใŒใงใใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -983,14 +991,14 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %3$s ใŒ่ฆ‹ใคใ‹ใ‚‰ใชใ„ใŸใ‚ใ€%2$s ใซๅฏพใ™ใ‚‹ %1$s ใฎไพๅญ˜้–ขไฟ‚ใ‚’ๆบ€ใŸใ™ใ“ใจ"
 "ใŒใงใใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s ใฎไพๅญ˜้–ขไฟ‚ %1$s ใ‚’ๆบ€ใŸใ™ใ“ใจใŒใงใใพใ›ใ‚“: ใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚ŒใŸ %3$s ใƒ‘ใƒƒ"
 "ใ‚ฑใƒผใ‚ธใฏๆ–ฐใ—ใ™ใŽใพใ™"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -999,7 +1007,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %3$s ใฎๅ€™่ฃœใƒใƒผใ‚ธใƒงใƒณใฏใƒใƒผใ‚ธใƒงใƒณใซใคใ„ใฆใฎ่ฆๆฑ‚ใ‚’ๆบ€ใŸใ›ใชใ„ใŸ"
 "ใ‚ใ€%2$s ใซๅฏพใ™ใ‚‹ %1$s ใฎไพๅญ˜้–ขไฟ‚ใ‚’ๆบ€ใŸใ™ใ“ใจใŒใงใใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1008,30 +1016,30 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %3$s ใฎๅ€™่ฃœใƒใƒผใ‚ธใƒงใƒณใŒๅญ˜ๅœจใ—ใชใ„ใŸใ‚ใ€%2$s ใซๅฏพใ™ใ‚‹ %1$s ใฎไพๅญ˜้–ข"
 "ไฟ‚ใ‚’ๆบ€ใŸใ™ใ“ใจใŒใงใใพใ›ใ‚“"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s ใฎไพๅญ˜้–ขไฟ‚ %1$s ใ‚’ๆบ€ใŸใ™ใ“ใจใŒใงใใพใ›ใ‚“: %3$s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s ใฎใƒ“ใƒซใƒ‰ไพๅญ˜้–ขไฟ‚ใ‚’ๆบ€ใŸใ™ใ“ใจใŒใงใใพใ›ใ‚“ใงใ—ใŸใ€‚"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "ใƒ“ใƒซใƒ‰ไพๅญ˜้–ขไฟ‚ใฎๅ‡ฆ็†ใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) ใฎๅค‰ๆ›ดๅฑฅๆญด"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ใ‚ตใƒใƒผใƒˆใ•ใ‚Œใฆใ„ใ‚‹ใƒขใ‚ธใƒฅใƒผใƒซ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1123,7 +1131,7 @@ msgstr ""
 "apt-get(8)ใ€sources.list(5)ใ€apt.conf(5) ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚\n"
 "                        ใ“ใฎ APT ใฏ Super Cow Powers ๅŒ–ใ•ใ‚Œใฆใ„ใพใ™ใ€‚\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1198,7 +1206,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ใฏใ™ใงใซไฟ็•™ใ•ใ‚Œใฆใ„ใพใ›ใ‚“ใ€‚\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s ใ‚’ๅพ…ใกใพใ—ใŸใŒใ€ใใ“ใซใฏใ‚ใ‚Šใพใ›ใ‚“ใงใ—ใŸ"
@@ -1355,8 +1364,8 @@ msgstr "ๆŽฅ็ถšใ‚ฟใ‚คใƒ ใ‚ขใ‚ฆใƒˆ"
 msgid "Server closed the connection"
 msgstr "ใ‚ตใƒผใƒใŒๆŽฅ็ถšใ‚’ๅˆ‡ๆ–ญใ—ใพใ—ใŸ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "่ชญใฟ่พผใฟใ‚จใƒฉใƒผ"
 
@@ -1369,8 +1378,8 @@ msgid "Protocol corruption"
 msgstr "ใƒ—ใƒญใƒˆใ‚ณใƒซใŒๅฃŠใ‚Œใฆใ„ใพใ™"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ๆ›ธใ่พผใฟใ‚จใƒฉใƒผ"
 
@@ -1424,7 +1433,7 @@ msgstr "ใƒ‡ใƒผใ‚ฟใ‚ฝใ‚ฑใƒƒใƒˆๆŽฅ็ถšใ‚ฟใ‚คใƒ ใ‚ขใ‚ฆใƒˆ"
 msgid "Unable to accept connection"
 msgstr "ๆŽฅ็ถšใ‚’ accept ใงใใพใ›ใ‚“"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ใƒ•ใ‚กใ‚คใƒซใฎใƒใƒƒใ‚ทใƒฅใงใฎๅ•้กŒ"
 
@@ -1451,87 +1460,100 @@ msgstr "ๅ•ใ„ๅˆใ‚ใ›"
 msgid "Unable to invoke "
 msgstr "ๅ‘ผใณๅ‡บใ›ใพใ›ใ‚“"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) ใธๆŽฅ็ถšใ—ใฆใ„ใพใ™"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) ใซๅฏพใ™ใ‚‹ใ‚ฝใ‚ฑใƒƒใƒˆใ‚’ไฝœๆˆใงใใพใ›ใ‚“"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s) ใธใฎๆŽฅ็ถšใ‚’้–‹ๅง‹ใงใใพใ›ใ‚“ใ€‚"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) ใธๆŽฅ็ถšใงใใพใ›ใ‚“ใงใ—ใŸใ€‚ๆŽฅ็ถšใŒใ‚ฟใ‚คใƒ ใ‚ขใ‚ฆใƒˆใ—ใพใ—ใŸ"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s (%s) ใธๆŽฅ็ถšใงใใพใ›ใ‚“ใงใ—ใŸใ€‚"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s ใธๆŽฅ็ถšใ—ใฆใ„ใพใ™"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s' ใ‚’่งฃๆฑบใงใใพใ›ใ‚“ใงใ—ใŸ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' ใŒไธ€ๆ™‚็š„ใซ่งฃๆฑบใงใใพใ›ใ‚“"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "'%s:%s' (%i - %s) ใฎ่งฃๆฑบไธญใซไฝ•ใ‹ๅ•้กŒใŒ่ตทใ“ใ‚Šใพใ—ใŸ"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i - %s) ใฎ่งฃๆฑบไธญใซไฝ•ใ‹ๅ•้กŒใŒ่ตทใ“ใ‚Šใพใ—ใŸ"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s ใธๆŽฅ็ถšใงใใพใ›ใ‚“:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ๅ†…้ƒจใ‚จใƒฉใƒผ: ๆญฃใ—ใ„็ฝฒๅใงใ™ใŒใ€้ตๆŒ‡็ด‹ใ‚’็ขบๅฎšใงใใพใ›ใ‚“?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "ๅฐ‘ใชใใจใ‚‚ 1 ใคใฎไธๆญฃใช็ฝฒๅใŒ็™บ่ฆ‹ใ•ใ‚Œใพใ—ใŸใ€‚"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "็ฝฒๅใ‚’ๆคœ่จผใ™ใ‚‹ใŸใ‚ใฎ 'gpgv' ใฎๅฎŸ่กŒใŒใงใใพใ›ใ‚“ใงใ—ใŸ (gpgv ใฏใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚Œ"
 "ใฆใ„ใพใ™ใ‹?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "gpgv ใฎๅฎŸ่กŒไธญใซๆœช็Ÿฅใฎใ‚จใƒฉใƒผใŒ็™บ็”Ÿ"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ไปฅไธ‹ใฎ็ฝฒๅใŒ็„กๅŠนใงใ™:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1569,53 +1591,53 @@ msgstr "HTTP ใ‚ตใƒผใƒใฎใƒฌใƒณใ‚ธใ‚ตใƒใƒผใƒˆใŒๅฃŠใ‚Œใฆใ„ใพใ™"
 msgid "Unknown date format"
 msgstr "ไธๆ˜Žใชๆ—ฅไป˜ใƒ•ใ‚ฉใƒผใƒžใƒƒใƒˆใงใ™"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "select ใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ๆŽฅ็ถšใ‚ฟใ‚คใƒ ใ‚ขใ‚ฆใƒˆ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ๅ‡บๅŠ›ใƒ•ใ‚กใ‚คใƒซใธใฎๆ›ธใ่พผใฟใงใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ใƒ•ใ‚กใ‚คใƒซใธใฎๆ›ธใ่พผใฟใงใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ใƒ•ใ‚กใ‚คใƒซใธใฎๆ›ธใ่พผใฟใงใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ใƒชใƒขใƒผใƒˆๅดใงๆŽฅ็ถšใŒใ‚ฏใƒญใƒผใ‚บใ•ใ‚Œใฆใ‚ตใƒผใƒใ‹ใ‚‰ใฎ่ชญใฟ่พผใฟใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ใ‚ตใƒผใƒใ‹ใ‚‰ใฎ่ชญใฟ่พผใฟใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ไธๆญฃใชใƒ˜ใƒƒใƒ€ใงใ™"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ๆŽฅ็ถšๅคฑๆ•—"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ๅ†…้ƒจใ‚จใƒฉใƒผ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s ใ‚’่ชญใฟ่พผใ‚€ใ“ใจใŒใงใใพใ›ใ‚“"
@@ -1642,7 +1664,12 @@ msgstr "ใƒŸใƒฉใƒผใƒ•ใ‚กใ‚คใƒซ '%s' ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“ "
 msgid "Can not read mirror file '%s'"
 msgstr "ใƒŸใƒฉใƒผใƒ•ใ‚กใ‚คใƒซ '%s' ใ‚’่ชญใฟ่พผใ‚ใพใ›ใ‚“"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ใƒŸใƒฉใƒผใƒ•ใ‚กใ‚คใƒซ '%s' ใ‚’่ชญใฟ่พผใ‚ใพใ›ใ‚“"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[ใƒŸใƒฉใƒผ: %s]"
@@ -1736,7 +1763,7 @@ msgstr ""
 "  -c=? ๆŒ‡ๅฎšใ—ใŸ่จญๅฎšใƒ•ใ‚กใ‚คใƒซใ‚’่ชญใฟ่พผใ‚€\n"
 "  -o=? ๆŒ‡ๅฎšใ—ใŸ่จญๅฎšใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ฉ็”จใ™ใ‚‹ (ไพ‹: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s ใซๆ›ธใ่พผใ‚ใพใ›ใ‚“"
@@ -1883,8 +1910,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "DB ใƒ•ใ‚กใ‚คใƒซ %s ใ‚’้–‹ใใ“ใจใŒใงใใพใ›ใ‚“: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s ใฎ็Šถๆ…‹ใ‚’ๅ–ๅพ—ใ™ใ‚‹ใฎใซๅคฑๆ•—ใ—ใพใ—ใŸ"
@@ -1897,87 +1924,87 @@ msgstr "ใ‚ขใƒผใ‚ซใ‚คใƒ–ใซใ‚ณใƒณใƒˆใƒญใƒผใƒซใƒฌใ‚ณใƒผใƒ‰ใŒใ‚ใ‚Šใพใ›ใ‚“"
 msgid "Unable to get a cursor"
 msgstr "ใ‚ซใƒผใ‚ฝใƒซใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "่ญฆๅ‘Š: ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช %s ใŒ่ชญใ‚ใพใ›ใ‚“\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "่ญฆๅ‘Š: %s ใฎ็Šถๆ…‹ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "ใ‚จใƒฉใƒผ: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "่ญฆๅ‘Š: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "ใ‚จใƒฉใƒผ: ใ‚จใƒฉใƒผใŒ้ฉ็”จใ•ใ‚Œใ‚‹ใƒ•ใ‚กใ‚คใƒซใฏ "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s ใฎ่งฃๆฑบใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ใƒ„ใƒชใƒผๅ†…ใงใฎ็งปๅ‹•ใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s ใฎใ‚ชใƒผใƒ—ใƒณใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " ใƒชใƒณใ‚ฏ %s [%s] ใ‚’ๅค–ใ—ใพใ™\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s ใฎใƒชใƒณใ‚ฏ่ชญใฟๅ–ใ‚Šใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s ใฎใƒชใƒณใ‚ฏ่งฃ้™คใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s ใ‚’ %s ใซใƒชใƒณใ‚ฏใ™ใ‚‹ใฎใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ใƒชใƒณใ‚ฏใ‚’ๅค–ใ™ๅˆถ้™ใฎ %sB ใซๅˆฐ้”ใ—ใพใ—ใŸใ€‚\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ใ‚ขใƒผใ‚ซใ‚คใƒ–ใซใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒ•ใ‚ฃใƒผใƒซใƒ‰ใŒใ‚ใ‚Šใพใ›ใ‚“ใงใ—ใŸ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ใซ override ใ‚จใƒณใƒˆใƒชใŒใ‚ใ‚Šใพใ›ใ‚“\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %1$s ใƒกใƒณใƒ†ใƒŠใฏ %3$s ใงใฏใชใ %2$s ใงใ™\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ใซใ‚ฝใƒผใ‚น override ใ‚จใƒณใƒˆใƒชใŒใ‚ใ‚Šใพใ›ใ‚“\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ใซใƒใ‚คใƒŠใƒช override ใ‚จใƒณใƒˆใƒชใŒใ‚ใ‚Šใพใ›ใ‚“\n"
@@ -2051,7 +2078,7 @@ msgstr "MD5 ใฎ่จˆ็ฎ—ไธญใซ่ชญใฟ่พผใฟใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 msgid "Problem unlinking %s"
 msgstr "%s ใฎใƒชใƒณใ‚ฏ่งฃ้™คใงๅ•้กŒใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s ใ‚’ %s ใซๅๅ‰ๅค‰ๆ›ดใงใใพใ›ใ‚“ใงใ—ใŸ"
@@ -2108,23 +2135,23 @@ msgstr ""
 "  -c=? ๆŒ‡ๅฎšใ—ใŸ่จญๅฎšใƒ•ใ‚กใ‚คใƒซใ‚’่ชญใฟ่พผใ‚€\n"
 "  -o=? ๆŒ‡ๅฎšใ—ใŸ่จญๅฎšใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’้ฉ็”จใ™ใ‚‹ (ไพ‹: -o dir::cache=/tmp)\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ใƒ‘ใ‚คใƒ—ใฎ็”Ÿๆˆใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "gzip ใฎๅฎŸ่กŒใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ๅฃŠใ‚ŒใŸใ‚ขใƒผใ‚ซใ‚คใƒ–"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "tar ใƒใ‚งใƒƒใ‚ฏใ‚ตใƒ ๆคœ่จผใŒๅคฑๆ•—ใ—ใพใ—ใŸใ€‚ใ‚ขใƒผใ‚ซใ‚คใƒ–ใŒๅฃŠใ‚Œใฆใ„ใพใ™"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ๆœช็Ÿฅใฎ TAR ใƒ˜ใƒƒใƒ€ใ‚ฟใ‚คใƒ— %uใ€ใƒกใƒณใƒใƒผ %s"
@@ -2195,55 +2222,55 @@ msgstr "ใƒ•ใ‚กใ‚คใƒซ %s ใฎๆ›ธใ่พผใฟใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 msgid "Failed to close file %s"
 msgstr "%s ใฎใ‚ฏใƒญใƒผใ‚บใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ใƒ‘ใ‚น %s ใฏ้•ทใ™ใŽใพใ™"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s ใ‚’่ค‡ๆ•ฐๅ›žๅฑ•้–‹ใ—ใฆใ„ใพใ™"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช %s ใฏ divert ใ•ใ‚Œใฆใ„ใพใ™"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 "ใ“ใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใฏ diversion ใฎใ‚ฟใƒผใ‚ฒใƒƒใƒˆใฎ %s/%s ใซๆ›ธใ่พผใ‚‚ใ†ใจใ—ใฆใ„ใพใ™"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "diversion ใƒ‘ใ‚นใŒ้•ทใ™ใŽใพใ™"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช %s ใŒ้žใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒชใซ็ฝฎๆ›ใ•ใ‚Œใ‚ˆใ†ใจใ—ใฆใ„ใพใ™"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ใƒใƒƒใ‚ทใƒฅใƒใ‚ฑใƒ„ๅ†…ใงใƒŽใƒผใƒ‰ใ‚’็‰นๅฎšใ™ใ‚‹ใฎใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ใƒ‘ใ‚นใŒ้•ทใ™ใŽใพใ™"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s ใซๅฏพใ™ใ‚‹ใƒใƒผใ‚ธใƒงใƒณใฎใชใ„ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒžใƒƒใƒใ‚’ไธŠๆ›ธใใ—ใพใ™"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ใƒ•ใ‚กใ‚คใƒซ %s/%s ใŒใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใฎใ‚‚ใฎใ‚’ไธŠๆ›ธใใ—ใพใ™"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s ใฎ็Šถๆ…‹ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“"
@@ -2324,30 +2351,30 @@ msgstr ""
 "่‡ชๅ‹•ๅข—ๅŠ ใŒใƒฆใƒผใ‚ถใซใ‚ˆใฃใฆ็„กๅŠนใซใ•ใ‚Œใฆใ„ใ‚‹ใŸใ‚ใ€MMap ใฎใ‚ตใ‚คใ‚บใ‚’ๅข—ใ‚„ใ›ใพใ›ใ‚“ใ€‚"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liๆ—ฅ %liๆ™‚้–“ %liๅˆ† %li็ง’"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liๆ™‚้–“ %liๅˆ† %li็ง’"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liๅˆ† %li็ง’"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%li็ง’"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "้ธๆŠžใ•ใ‚ŒใŸ %s ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
@@ -2419,6 +2446,16 @@ msgstr "%c%s... ใ‚จใƒฉใƒผ!"
 msgid "%c%s... Done"
 msgstr "%c%s... ๅฎŒไบ†"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ๅฎŒไบ†"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2479,43 +2516,43 @@ msgstr "CD-ROM ใฎ็Šถๆ…‹ใ‚’ๅ–ๅพ—ใ™ใ‚‹ใฎใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 msgid "Problem closing the gzip file %s"
 msgstr "gzip ใƒ•ใ‚กใ‚คใƒซ %s ใฎใ‚ฏใƒญใƒผใ‚บไธญใซๅ•้กŒใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "่ชญใฟ่พผใฟๅฐ‚็”จใฎใƒญใƒƒใ‚ฏใƒ•ใ‚กใ‚คใƒซ %s ใซใƒญใƒƒใ‚ฏใฏไฝฟ็”จใ—ใพใ›ใ‚“"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ใƒญใƒƒใ‚ฏใƒ•ใ‚กใ‚คใƒซ %s ใ‚’ใ‚ชใƒผใƒ—ใƒณใงใใพใ›ใ‚“"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs ใƒžใ‚ฆใƒณใƒˆใ•ใ‚ŒใŸใƒญใƒƒใ‚ฏใƒ•ใ‚กใ‚คใƒซ %s ใซใฏใƒญใƒƒใ‚ฏใ‚’ไฝฟ็”จใ—ใพใ›ใ‚“"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ใƒญใƒƒใ‚ฏ %s ใŒๅ–ๅพ—ใงใใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "'%s' ใŒใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒชใงใฏใชใ„ใŸใ‚ใ€ใƒ•ใ‚กใ‚คใƒซใฎไธ€่ฆงใ‚’ไฝœๆˆใงใใพใ›ใ‚“"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช '%2$s' ใฎ '%1$s' ใŒ้€šๅธธใƒ•ใ‚กใ‚คใƒซใงใฏใชใ„ใŸใ‚ใ€็„ก่ฆ–ใ—ใพใ™"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช '%2$s' ใฎ '%1$s' ใŒใƒ•ใ‚กใ‚คใƒซๅๆ‹กๅผตๅญใ‚’ๆŒใŸใชใ„ใŸใ‚ใ€็„ก่ฆ–ใ—ใพใ™"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2523,73 +2560,79 @@ msgstr ""
 "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช '%2$s' ใฎ '%1$s' ใŒ็„กๅŠนใชใƒ•ใ‚กใ‚คใƒซๅๆ‹กๅผตๅญใ‚’ๆŒใฃใฆใ„ใ‚‹ใŸใ‚ใ€็„ก่ฆ–"
 "ใ—ใพใ™"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ๅญใƒ—ใƒญใ‚ปใ‚น %s ใŒใ‚ปใ‚ฐใƒกใƒณใƒ†ใƒผใ‚ทใƒงใƒณ้•ๅใ‚’ๅ—ใ‘ๅ–ใ‚Šใพใ—ใŸใ€‚"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ๅญใƒ—ใƒญใ‚ปใ‚น %s ใŒใ‚ทใ‚ฐใƒŠใƒซ %u ใ‚’ๅ—ใ‘ๅ–ใ‚Šใพใ—ใŸใ€‚"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ๅญใƒ—ใƒญใ‚ปใ‚น %s ใŒใ‚จใƒฉใƒผใ‚ณใƒผใƒ‰ (%u) ใ‚’่ฟ”ใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ๅญใƒ—ใƒญใ‚ปใ‚น %s ใŒไบˆๆœŸใ›ใš็ต‚ไบ†ใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "ใƒ•ใ‚กใ‚คใƒซ %s ใ‚’ใ‚ชใƒผใƒ—ใƒณใงใใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ใƒ•ใ‚กใ‚คใƒซใƒ‡ใ‚นใ‚ฏใƒชใƒ—ใ‚ฟ %d ใ‚’้–‹ใ‘ใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ๅญใƒ—ใƒญใ‚ปใ‚น IPC ใฎ็”Ÿๆˆใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "ไปฅไธ‹ใฎๅœง็ธฎใƒ„ใƒผใƒซใฎๅฎŸ่กŒใซๅคฑๆ•—ใ—ใพใ—ใŸ: "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "่ชญใฟ่พผใฟใŒ %llu ๆฎ‹ใฃใฆใ„ใ‚‹ใฏใšใงใ™ใŒใ€ไฝ•ใ‚‚ๆฎ‹ใฃใฆใ„ใพใ›ใ‚“"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ใ‚ใจ %llu ๆ›ธใ่พผใ‚€ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใŒใ€ๆ›ธใ่พผใ‚€ใ“ใจใŒใงใใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ใƒ•ใ‚กใ‚คใƒซ %s ใฎใ‚ฏใƒญใƒผใ‚บไธญใซๅ•้กŒใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s ใ‹ใ‚‰ %s ใธใฎใƒ•ใ‚กใ‚คใƒซๅๅค‰ๆ›ดไธญใซๅ•้กŒใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ใƒ•ใ‚กใ‚คใƒซ %s ใฎๅ‰Š้™คไธญใซๅ•้กŒใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ใƒ•ใ‚กใ‚คใƒซใฎๅŒๆœŸไธญใซๅ•้กŒใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s ใซใ‚ญใƒผใƒชใƒณใ‚ฐใŒใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚Œใฆใ„ใพใ›ใ‚“ใ€‚"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "็ฉบใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚ญใƒฃใƒƒใ‚ทใƒฅ"
@@ -2615,59 +2658,59 @@ msgstr "ใ“ใฎ APT ใฏใƒใƒผใ‚ธใƒงใƒ‹ใƒณใ‚ฐใ‚ทใ‚นใƒ†ใƒ  '%s' ใ‚’ใ‚ตใƒใƒผใƒˆใ—ใ
 msgid "The package cache was built for a different architecture"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚ญใƒฃใƒƒใ‚ทใƒฅใŒ็•ฐใชใ‚‹ใ‚ขใƒผใ‚ญใƒ†ใ‚ฏใƒใƒฃ็”จใซๆง‹็ฏ‰ใ•ใ‚Œใฆใ„ใพใ™"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ไพๅญ˜"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "ๅ…ˆ่กŒไพๅญ˜"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ๆๆกˆ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ๆŽจๅฅจ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "็ซถๅˆ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "็ฝฎๆ›"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ๅปƒๆญข"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "็ ดๅฃŠ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "ๆ‹กๅผต"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "้‡่ฆ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "่ฆๆฑ‚"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ๆจ™ๆบ–"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ไปปๆ„"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "็‰นๅˆฅ"
 
@@ -2771,17 +2814,17 @@ msgstr "%s ใ‚’ใ‚ชใƒผใƒ—ใƒณใ—ใฆใ„ใพใ™"
 msgid "Line %u too long in source list %s."
 msgstr "ใ‚ฝใƒผใ‚นใƒชใ‚นใƒˆ %2$s ใฎ %1$u ่กŒ็›ฎใŒ้•ทใ™ใŽใพใ™ใ€‚"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ใ‚ฝใƒผใ‚นใƒชใ‚นใƒˆ %2$s ใฎ %1$u ่กŒ็›ฎใŒไธๆญฃใงใ™ (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ใ‚ฝใƒผใ‚นใƒชใ‚นใƒˆ %3$s ใฎ %2$u ่กŒใซใ‚ใ‚‹ใ‚ฟใ‚คใƒ— '%1$s' ใฏไธๆ˜Žใงใ™"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2790,12 +2833,12 @@ msgstr ""
 "'%s' ใฎๅณๆ™‚่จญๅฎšใฏๅ‹•ไฝœใ—ใพใ›ใ‚“ใ€‚่ฉณ็ดฐใซใคใ„ใฆใฏ man 5 apt.conf ใฎ APT::"
 "Immediate-Configure ใฎ้ …ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚(%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "'%s' ใ‚’่จญๅฎšใงใใพใ›ใ‚“ใงใ—ใŸใ€‚"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2819,7 +2862,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใ‚’ๅ†ใ‚คใƒณใ‚นใƒˆใƒผใƒซใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใŒใ€ใใฎใŸใ‚ใฎใ‚ขใƒผใ‚ซใ‚คใƒ–ใ‚’่ฆ‹"
 "ใคใ‘ใ‚‹ใ“ใจใŒใงใใพใ›ใ‚“ใงใ—ใŸใ€‚"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2827,11 +2870,11 @@ msgstr ""
 "ใ‚จใƒฉใƒผใ€pkgProblemResolver::Resolve ใฏๅœๆญขใ—ใพใ—ใŸใ€‚ใŠใใ‚‰ใๅค‰ๆ›ด็ฆๆญขใƒ‘ใƒƒใ‚ฑใƒผ"
 "ใ‚ธใŒๅŽŸๅ› ใงใ™ใ€‚"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ๅ•้กŒใ‚’่งฃๆฑบใ™ใ‚‹ใ“ใจใŒใงใใพใ›ใ‚“ใ€‚ๅฃŠใ‚ŒใŸๅค‰ๆ›ด็ฆๆญขใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใŒใ‚ใ‚Šใพใ™ใ€‚"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2839,7 +2882,7 @@ msgstr ""
 "ใ„ใใคใ‹ใฎใ‚คใƒณใƒ‡ใƒƒใ‚ฏใ‚นใƒ•ใ‚กใ‚คใƒซใฎใƒ€ใ‚ฆใƒณใƒญใƒผใƒ‰ใซๅคฑๆ•—ใ—ใพใ—ใŸใ€‚ใ“ใ‚Œใ‚‰ใฏ็„ก่ฆ–ใ•ใ‚Œ"
 "ใ‚‹ใ‹ใ€ๅคใ„ใ‚‚ใฎใŒไปฃใ‚ใ‚Šใซไฝฟใ‚ใ‚Œใพใ™ใ€‚"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "ใƒชใ‚นใƒˆใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช %spartial ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“ใ€‚"
@@ -2876,19 +2919,19 @@ msgstr "ใƒกใ‚ฝใƒƒใƒ‰ใƒ‰ใƒฉใ‚คใƒ %s ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“ใ€‚"
 msgid "Method %s did not start correctly"
 msgstr "ใƒกใ‚ฝใƒƒใƒ‰ %s ใŒๆญฃๅธธใซ้–‹ๅง‹ใ—ใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "'%s' ใจใƒฉใƒ™ใƒซใฎไป˜ใ„ใŸใƒ‡ใ‚ฃใ‚นใ‚ฏใ‚’ใƒ‰ใƒฉใ‚คใƒ– '%s' ใซๅ…ฅใ‚Œใฆ Enter ใ‚ญใƒผใ‚’ๆŠผใ—ใฆใใ "
 "ใ•ใ„ใ€‚"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒณใ‚ฐใ‚ทใ‚นใƒ†ใƒ  '%s' ใฏใ‚ตใƒใƒผใƒˆใ•ใ‚Œใฆใ„ใพใ›ใ‚“"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "้ฉๅˆ‡ใชใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚ทใ‚นใƒ†ใƒ ใ‚ฟใ‚คใƒ—ใ‚’็‰นๅฎšใงใใพใ›ใ‚“"
 
@@ -2949,14 +2992,14 @@ msgstr "ใ‚ญใƒฃใƒƒใ‚ทใƒฅใซ้žไบ’ๆ›ใชใƒใƒผใ‚ธใƒงใƒ‹ใƒณใ‚ฐใ‚ทใ‚นใƒ†ใƒ ใŒใ‚ใ‚Š
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s ใ‚’ๅ‡ฆ็†ไธญใซใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸ (%s%d)"
@@ -2977,26 +3020,26 @@ msgstr "ใ“ใฎ APT ใŒๅฏพๅฟœใ—ใฆใ„ใ‚‹ไปฅไธŠใฎๆ•ฐใฎ่ชฌๆ˜ŽใŒ่ฆๆฑ‚ใ•ใ‚Œใพใ
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "ใ“ใฎ APT ใŒๅฏพๅฟœใ—ใฆใ„ใ‚‹ไปฅไธŠใฎๆ•ฐใฎไพๅญ˜้–ขไฟ‚ใŒ็™บ็”Ÿใ—ใพใ—ใŸใ€‚"
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s %s ใŒใƒ•ใ‚กใ‚คใƒซไพๅญ˜ใฎๅ‡ฆ็†ไธญใซ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ใ‚ฝใƒผใ‚นใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒชใ‚นใƒˆ %s ใฎ็Šถๆ…‹ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒชใ‚นใƒˆใ‚’่ชญใฟ่พผใ‚“ใงใ„ใพใ™"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ใƒ•ใ‚กใ‚คใƒซๆไพ›ๆƒ…ๅ ฑใ‚’ๅŽ้›†ใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ใ‚ฝใƒผใ‚นใ‚ญใƒฃใƒƒใ‚ทใƒฅใฎไฟๅญ˜ไธญใซ IO ใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸ"
 
@@ -3009,12 +3052,12 @@ msgstr "ๅๅ‰ใฎๅค‰ๆ›ดใซๅคฑๆ•—ใ—ใพใ—ใŸใ€‚%s (%s -> %s)"
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ใŒ้ฉๅˆใ—ใพใ›ใ‚“"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "ใƒใƒƒใ‚ทใƒฅใ‚ตใƒ ใŒ้ฉๅˆใ—ใพใ›ใ‚“"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3023,16 +3066,16 @@ msgstr ""
 "ๆœŸๅพ…ใ•ใ‚Œใ‚‹ใ‚จใƒณใƒˆใƒช '%s' ใŒ Release ใƒ•ใ‚กใ‚คใƒซๅ†…ใซ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“ (่ชคใฃใŸ "
 "sources.list ใ‚จใƒณใƒˆใƒชใ‹ใ€ๅฃŠใ‚ŒใŸใƒ•ใ‚กใ‚คใƒซ)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release ใƒ•ใ‚กใ‚คใƒซไธญใฎ '%s' ใฎใƒใƒƒใ‚ทใƒฅใ‚ตใƒ ใ‚’่ฆ‹ใคใ‘ใ‚‰ใ‚Œใพใ›ใ‚“"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ไปฅไธ‹ใฎ้ต ID ใซๅฏพใ—ใฆๅˆฉ็”จๅฏ่ƒฝใชๅ…ฌ้–‹้ตใŒใ‚ใ‚Šใพใ›ใ‚“:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3041,29 +3084,29 @@ msgstr ""
 "%s ใฎ Release ใƒ•ใ‚กใ‚คใƒซใฏๆœŸ้™ๅˆ‡ใ‚Œ (%s ไปฅๆฅ็„กๅŠน) ใงใ™ใ€‚ใ“ใฎใƒชใƒใ‚ธใƒˆใƒชใ‹ใ‚‰ใฎๆ›ดๆ–ฐ"
 "็‰ฉใฏ้ฉ็”จใ•ใ‚Œใพใ›ใ‚“ใ€‚"
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 "ใƒ‡ใ‚ฃใ‚นใƒˆใƒชใƒ“ใƒฅใƒผใ‚ทใƒงใƒณใŒ็ซถๅˆใ—ใฆใ„ใพใ™: %s (%s ใ‚’ๆœŸๅพ…ใ—ใฆใ„ใŸใฎใซ %s ใ‚’ๅ–ๅพ—ใ—"
 "ใพใ—ใŸ)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "็ฝฒๅ็…งๅˆไธญใซใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸใ€‚ใƒชใƒใ‚ธใƒˆใƒชใฏๆ›ดๆ–ฐใ•ใ‚Œใšใ€้ŽๅŽปใฎใ‚คใƒณใƒ‡ใƒƒใ‚ฏใ‚น"
 "ใƒ•ใ‚กใ‚คใƒซใŒไฝฟใ‚ใ‚Œใพใ™ใ€‚GPG ใ‚จใƒฉใƒผ: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG ใ‚จใƒฉใƒผ: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,7 +3115,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใฎใƒ•ใ‚กใ‚คใƒซใฎไฝ็ฝฎใ‚’็‰นๅฎšใงใใพใ›ใ‚“ใ€‚ใŠใใ‚‰ใใ“ใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’ๆ‰‹ๅ‹•"
 "ใงไฟฎๆญฃใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ (ๅญ˜ๅœจใ—ใชใ„ใ‚ขใƒผใ‚ญใƒ†ใ‚ฏใƒใƒฃใฎใŸใ‚)ใ€‚"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3081,7 +3124,7 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใฎใƒ•ใ‚กใ‚คใƒซใฎไฝ็ฝฎใ‚’็‰นๅฎšใงใใพใ›ใ‚“ใ€‚ใŠใใ‚‰ใใ“ใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚’ๆ‰‹ๅ‹•"
 "ใงไฟฎๆญฃใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3089,31 +3132,31 @@ msgstr ""
 "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใ‚คใƒณใƒ‡ใƒƒใ‚ฏใ‚นใƒ•ใ‚กใ‚คใƒซใŒๅฃŠใ‚Œใฆใ„ใพใ™ใ€‚ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธ %s ใซ Filename: "
 "ใƒ•ใ‚ฃใƒผใƒซใƒ‰ใŒใ‚ใ‚Šใพใ›ใ‚“ใ€‚"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ใ‚ตใ‚คใ‚บใŒ้ฉๅˆใ—ใพใ›ใ‚“"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release ใƒ•ใ‚กใ‚คใƒซ %s ใ‚’่งฃ้‡ˆใ™ใ‚‹ใ“ใจใŒใงใใพใ›ใ‚“"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Release ใƒ•ใ‚กใ‚คใƒซ %s ใซใ‚ปใ‚ฏใ‚ทใƒงใƒณใŒใ‚ใ‚Šใพใ›ใ‚“"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Release ใƒ•ใ‚กใ‚คใƒซ %s ใซ Hash ใ‚จใƒณใƒˆใƒชใŒใ‚ใ‚Šใพใ›ใ‚“"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Release ใƒ•ใ‚กใ‚คใƒซ %s ใซ็„กๅŠนใช 'Valid-Until' ใ‚จใƒณใƒˆใƒชใŒใ‚ใ‚Šใพใ™"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Release ใƒ•ใ‚กใ‚คใƒซ %s ใซ็„กๅŠนใช 'Date' ใ‚จใƒณใƒˆใƒชใŒใ‚ใ‚Šใพใ™"
@@ -3141,7 +3184,7 @@ msgstr "็ขบ่ชใ—ใฆใ„ใพใ™.. "
 msgid "Stored label: %s\n"
 msgstr "ๆ ผ็ดใ•ใ‚ŒใŸใƒฉใƒ™ใƒซ: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM ใ‚’ใ‚ขใƒณใƒžใ‚ฆใƒณใƒˆใ—ใฆใ„ใพใ™ ...\n"
 
@@ -3205,30 +3248,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใƒชใ‚นใƒˆใ‚’ใ‚ณใƒ”ใƒผใ—ใฆใ„ใพใ™ ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ๆ–ฐใ—ใ„ใ‚ฝใƒผใ‚นใƒชใ‚นใƒˆใ‚’ๆ›ธใ่พผใ‚“ใงใ„ใพใ™\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ใ“ใฎใƒ‡ใ‚ฃใ‚นใ‚ฏใฎใ‚ฝใƒผใ‚นใƒชใ‚นใƒˆใฎใ‚จใƒณใƒˆใƒช:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i ใƒฌใ‚ณใƒผใƒ‰ใ‚’ๆ›ธใ่พผใฟใพใ—ใŸใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i ใƒฌใ‚ณใƒผใƒ‰ใ‚’ๆ›ธใ่พผใฟใพใ—ใŸใ€‚%i ๅ€‹ใฎใƒ•ใ‚กใ‚คใƒซใŒๅญ˜ๅœจใ—ใพใ›ใ‚“ใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i ใƒฌใ‚ณใƒผใƒ‰ใ‚’ๆ›ธใ่พผใฟใพใ—ใŸใ€‚%i ๅ€‹ใฎ้ฉๅˆใ—ใชใ„ใƒ•ใ‚กใ‚คใƒซใŒใ‚ใ‚Šใพใ™ใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3245,17 +3288,6 @@ msgstr "่ช่จผใƒฌใ‚ณใƒผใƒ‰ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“: %s"
 msgid "Hash mismatch for: %s"
 msgstr "ใƒใƒƒใ‚ทใƒฅใ‚ตใƒ ใŒ้ฉๅˆใ—ใพใ›ใ‚“: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "ใƒ•ใ‚กใ‚คใƒซ %s ใฏใ‚ฏใƒชใ‚ข็ฝฒๅใ•ใ‚ŒใŸใƒกใƒƒใ‚ปใƒผใ‚ธใงๅง‹ใพใฃใฆใ„ใพใ›ใ‚“"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s ใซใ‚ญใƒผใƒชใƒณใ‚ฐใŒใ‚คใƒณใ‚นใƒˆใƒผใƒซใ•ใ‚Œใฆใ„ใพใ›ใ‚“ใ€‚"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3324,115 +3356,115 @@ msgstr "่งฃๆฑบใ‚’ๅ—ใ‘ๅ–ใ‚‹ๆบ–ๅ‚™"
 msgid "External solver failed without a proper error message"
 msgstr "ๅค–้ƒจใ‚ฝใƒซใƒใŒ้ฉๅˆ‡ใชใ‚จใƒฉใƒผใƒกใƒƒใ‚ปใƒผใ‚ธใชใ—ใซๅคฑๆ•—ใ—ใพใ—ใŸ"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "ๅค–้ƒจใ‚ฝใƒซใƒใ‚’ๅฎŸ่กŒ"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s ใ‚’ใ‚คใƒณใ‚นใƒˆใƒผใƒซใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s ใ‚’่จญๅฎšใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s ใ‚’ๅ‰Š้™คใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s ใ‚’ๅฎŒๅ…จใซๅ‰Š้™คใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s ใฎๆถˆๅคฑใ‚’่จ˜้Œฒใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ใ‚คใƒณใ‚นใƒˆใƒผใƒซๅพŒใƒˆใƒชใ‚ฌ %s ใ‚’ๅฎŸ่กŒใ—ใฆใ„ใพใ™"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ใƒ‡ใ‚ฃใƒฌใ‚ฏใƒˆใƒช '%s' ใŒ่ฆ‹ใคใ‹ใ‚Šใพใ›ใ‚“"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ใƒ•ใ‚กใ‚คใƒซ '%s' ใ‚’ใ‚ชใƒผใƒ—ใƒณใงใใพใ›ใ‚“ใงใ—ใŸ"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s ใ‚’ๆบ–ๅ‚™ใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s ใ‚’ๅฑ•้–‹ใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s ใฎ่จญๅฎšใ‚’ๆบ–ๅ‚™ใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s ใ‚’ใ‚คใƒณใ‚นใƒˆใƒผใƒซใ—ใพใ—ใŸ"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ใฎๅ‰Š้™คใ‚’ๆบ–ๅ‚™ใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s ใ‚’ๅ‰Š้™คใ—ใพใ—ใŸ"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s ใ‚’ๅฎŒๅ…จใซๅ‰Š้™คใ™ใ‚‹ๆบ–ๅ‚™ใ‚’ใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s ใ‚’ๅฎŒๅ…จใซๅ‰Š้™คใ—ใพใ—ใŸ"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ใƒญใ‚ฐใซๆ›ธใ่พผใ‚ใพใ›ใ‚“ใ€‚openpty() ใซๅคฑๆ•—ใ—ใพใ—ใŸ (/dev/pts ใŒใƒžใ‚ฆใƒณใƒˆใ•ใ‚Œใฆใ„ใช"
 "ใ„?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "dpkg ใ‚’ๅฎŸ่กŒใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "ๆ“ไฝœใฏใใ‚ŒใŒๅฎŒไบ†ใ™ใ‚‹ๅ‰ใซไธญๆ–ญใ•ใ‚Œใพใ—ใŸ"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "MaxReports ใซใ™ใงใซ้”ใ—ใฆใ„ใ‚‹ใŸใ‚ใ€ใƒฌใƒใƒผใƒˆใฏๆ›ธใ่พผใพใ‚Œใพใ›ใ‚“"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "ไพๅญ˜้–ขไฟ‚ใฎๅ•้กŒ - ๆœช่จญๅฎšใฎใพใพใซใ—ใฆใ„ใพใ™"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3440,7 +3472,7 @@ msgstr ""
 "ใ‚จใƒฉใƒผใƒกใƒƒใ‚ปใƒผใ‚ธใฏๅ‰ใฎๅคฑๆ•—ใ‹ใ‚‰็ถšใใ‚จใƒฉใƒผใงใ‚ใ‚‹ใ“ใจใ‚’็คบใ—ใฆใ„ใ‚‹ใฎใงใ€ใƒฌใƒใƒผใƒˆ"
 "ใฏๆ›ธใ่พผใพใ‚Œใพใ›ใ‚“ใ€‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3456,15 +3488,7 @@ msgstr ""
 "ใ‚จใƒฉใƒผใƒกใƒƒใ‚ปใƒผใ‚ธใฏใƒกใƒขใƒช่ถ…้Žใ‚จใƒฉใƒผใงใ‚ใ‚‹ใ“ใจใ‚’็คบใ—ใฆใ„ใ‚‹ใฎใงใ€ใƒฌใƒใƒผใƒˆใฏๆ›ธใ"
 "่พผใพใ‚Œใพใ›ใ‚“ใ€‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"ใ‚จใƒฉใƒผใƒกใƒƒใ‚ปใƒผใ‚ธใŒใƒญใƒผใ‚ซใƒซใ‚ทใ‚นใƒ†ใƒ ไธŠใฎๅ•้กŒใ‚’็คบใ—ใฆใ„ใ‚‹ใฎใงใ€apportใฎๅ ฑๅ‘Šใซใฏ"
-"่จ˜่ผ‰ใ•ใ‚Œใพใ›ใ‚“"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3500,20 +3524,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "ใƒญใƒƒใ‚ฏใ•ใ‚Œใฆใ„ใพใ›ใ‚“"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "'%s:%s' (%i - %s) ใฎ่งฃๆฑบไธญใซไฝ•ใ‹ๅ•้กŒใŒ่ตทใ“ใ‚Šใพใ—ใŸ"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ๅฎŒไบ†"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "็ฝฒๅ็…งๅˆไธญใซใ‚จใƒฉใƒผใŒ็™บ็”Ÿใ—ใพใ—ใŸใ€‚ใƒชใƒใ‚ธใƒˆใƒชใฏๆ›ดๆ–ฐใ•ใ‚Œใšใ€้ŽๅŽปใฎใ‚คใƒณใƒ‡ใƒƒใ‚ฏ"
-#~ "ใ‚นใƒ•ใ‚กใ‚คใƒซใŒไฝฟใ‚ใ‚Œใพใ™ใ€‚GPG ใ‚จใƒฉใƒผ: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "ใƒ•ใ‚กใ‚คใƒซ %s ใฏใ‚ฏใƒชใ‚ข็ฝฒๅใ•ใ‚ŒใŸใƒกใƒƒใ‚ปใƒผใ‚ธใงๅง‹ใพใฃใฆใ„ใพใ›ใ‚“"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ๅญ˜ๅœจใ—ใชใ„ใƒ•ใ‚กใ‚คใƒซ %s ใ‚’ใ‚นใ‚ญใƒƒใƒ—ใ—ใฆใ„ใพใ™"
diff --git a/po/km.po b/po/km.po
index 51bec27fb..7dbd640b6 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -101,73 +101,73 @@ msgstr "แž‘แŸ†แž แŸ†โ€‹แžŸแžšแžปแž”โ€‹แžŠแŸ‚แž›โ€‹แž‘แžปแž€โ€‹แžŸแž˜แŸ’แžšแžถแž”
 msgid "Package file %s is out of sync."
 msgstr "แžฏแž€แžŸแžถแžšโ€‹แž€แž‰แŸ’แž…แž”แŸ‹ %s แž“แŸ…โ€‹แžแžถแž„แž€แŸ’แžšแŸ…โ€‹แž€แžถแžšโ€‹แž’แŸ’แžœแžพแžŸแž˜แž€แžถแž›แž€แž˜แŸ’แž˜ย แŸ”"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "แžšแž€โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "แžขแŸ’แž“แž€โ€‹แžแŸ’แžšแžผแžœโ€‹แžแŸ‚โ€‹แž•แŸ’แžŠแž›แŸ‹โ€‹แž›แŸ†แž“แžถแŸ†โ€‹แž˜แžฝแž™โ€‹แžŠแŸ‚แž›โ€‹แž–แžทแžโ€‹แž”แŸ’แžšแžถแž€แžŠ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แž‘แžธแžแžถแŸ†แž„โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "แžฏแž€แžŸแžถแžšโ€‹แž€แž‰แŸ’แž…แž”แŸ‹ย แŸ–"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "แžƒแŸ’แž›แžถแŸ†แž„โ€‹แžŸแž˜แŸ’แž„แžถแžแŸ‹โ€‹แž‹แžทแžแž“แŸ…โ€‹แž€แŸ’แžšแŸ…โ€‹แž€แžถแžšโ€‹แž’แŸ’แžœแžพโ€‹แžŸแž˜แž€แžถแž›โ€‹แž€แž˜แŸ’แž˜ แžŠแŸ‚แž›แž˜แžทแž“โ€‹แžขแžถแž… x-ref แžฏแž€แžŸแžถแžšโ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž”แžถแž“โ€‹แž‘แŸ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แžแŸ’แž‘แžถแžŸแŸ‹ย แŸ–"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(แžšแž€โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  แž”แžถแž“โ€‹แžŠแŸ†แžกแžพแž„ย แŸ– "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  แžŸแžถแž€แž›แŸ’แž”แž„ย แŸ– "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(แž‚แŸ’แž˜แžถแž“)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  แžแŸ’แž‘แžถแžŸแŸ‹โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ย แŸ– "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  แžแžถแžšแžถแž„โ€‹แž€แŸ†แžŽแŸ‚ย แŸ–"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s %s แž”แžถแž“โ€‹แž…แž„แž€แŸ’แžšแž„แž“แŸ…แž›แžพโ€‹%s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,21 +240,29 @@ msgstr ""
 "  -o=? แž€แŸ†แžŽแžแŸ‹โ€‹แž‡แž˜แŸ’แžšแžพแžŸโ€‹แž€แžถแžšโ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžšแž…แž“แžถโ€‹แžŸแž˜แŸ’แž–แŸแž“แŸ’แž’โ€‹แžแžถแž˜โ€‹แž…แžทแžแŸ’แž แžง. eg -o dir::cache=/tmp\n"
 "แž˜แžพแž›โ€‹ apt-cache(8) แž“แžทแž„โ€‹ apt.conf(5) แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แž–แŸแžแŸŒแž˜แžถแž“โ€‹แž”แž“แŸ’แžแŸ‚แž˜โ€‹โ€‹แž˜แžถแž“โ€‹แž€แŸ’แž“แžปแž„โ€‹แž‘แŸ†แž–แŸแžšโ€‹แžŸแŸ€แžœแž—แŸ…แžŠแŸƒโ€‹ย แŸ”\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "แžŸแžผแž˜โ€‹แž•แŸ’แžŠแž›แŸ‹โ€‹แžˆแŸ’แž˜แŸ„แŸ‡โ€‹แžฒแŸ’แž™โ€‹แžแžถแžŸโ€‹แž“แŸแŸ‡ แžงแž‘แžถแž แžšแžŽแŸโ€‹แžŠแžผแž…แž‡แžถ 'แžŠแŸแž”แŸ€แž“ 2.1r1 แžแžถแžŸโ€‹แž‘แžธ แŸก' แž‡แžถแžŠแžพแž˜"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "แžŸแžผแž˜โ€‹แž”แž‰แŸ’แž…แžผแž›โ€‹แžแžถแžŸโ€‹แž€แŸ’แž“แžปแž„โ€‹แžŠแŸ’แžšแžถแž™โ€‹แž แžพแž™โ€‹แž…แžปแž…โ€‹แž”แž‰แŸ’แž…แžผแž›โ€‹"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แŸ’แžแžผแžšโ€‹แžˆแŸ’แž˜แŸ„แŸ‡ %s แž‘แŸ… %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "แž’แŸ’แžœแžพแžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แž“แŸแŸ‡โ€‹แž˜แŸ’แžแž„โ€‹แž‘แŸ€แžโ€‹ แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แžŸแŸŠแžธแžŒแžธโ€‹แž‘แžถแŸ†แž„แžขแžŸแŸ‹โ€‹โ€‹แž€แŸ’แž“แžปแž„โ€‹แžŸแŸ†แžŽแžปแŸ†โ€‹แžšแž”แžŸแŸ‹โ€‹แžขแŸ’แž“แž€ย แŸ”"
 
@@ -488,7 +496,7 @@ msgstr "แž˜แžทแž“แžขแžถแž…แž’แŸ’แžœแžพแž€แžถแžšแžŠแŸ†แžกแžพแž„ %s แžกแžพแž„แžœแž
 msgid "%s is already the newest version.\n"
 msgstr "%s แž‡แžถแž€แŸ†แžŽแŸ‚โ€‹แžŠแŸ‚แž›แžแŸ’แž˜แžธแž”แŸ†แž•แžปแžแžšแžฝแž…แž‘แŸ…แž แžพแž™ย แŸ”\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "แž”แŸ‰แžปแž“แŸ’แžแŸ‚โ€‹ %s แž“แžนแž„โ€‹แžแŸ’แžšแžผแžœโ€‹แž”แžถแž“โ€‹แžŠแŸ†แžกแžพโ€‹แž„"
@@ -595,8 +603,8 @@ msgstr "แž”แž“แŸ’แž‘แžถแž”แŸ‹โ€‹แž–แžธโ€‹แž–แž“แŸ’แž›แžถโ€‹ %sB แž“แŸƒโ€‹แž€แžถแ
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "แž”แž“แŸ’แž‘แžถแž”แŸ‹โ€‹แž–แžธโ€‹แž–แž“แŸ’แž›แžถโ€‹ %sB แž‘แŸ†แž แŸ†โ€‹แžแžถแžŸแž“แžนแž„โ€‹โ€‹แž‘แŸ†แž“แŸแžšย แŸ”ย \n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แž‘แŸ†แž แŸ†โ€‹แž‘แŸ†แž“แŸแžšโ€‹แž€แŸ’แž“แžปแž„โ€‹ %s แž”แžถแž“แžกแžพแž™"
@@ -635,7 +643,7 @@ msgstr "แž”แŸ„แŸ‡แž”แž„แŸ‹ย แŸ”"
 msgid "Do you want to continue [Y/n]? "
 msgstr "แžแžพโ€‹แžขแŸ’แž“แž€โ€‹แž…แž„แŸ‹โ€‹แž”แž“แŸ’แžแžฌโ€‹ [แž”แžถแž‘ แž…แžถแžŸ/แž‘แŸโ€‹]ย ? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž‘แŸ…โ€‹แž”แŸ’แžšแž˜แžผแž›โ€‹แž™แž€โ€‹ %s  %s\n"
@@ -644,7 +652,7 @@ msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž‘แŸ…โ€‹แž”แŸ’แžšแž˜
 msgid "Some files failed to download"
 msgstr "แžฏแž€แžŸแžถแžšโ€‹แž˜แžฝแž™โ€‹แž…แŸ†แž“แžฝแž“โ€‹แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž‘แžถแž‰โ€‹แž™แž€โ€‹"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "แž”แžถแž“แž”แž‰แŸ’แž…แž”แŸ‹แž€แžถแžšแž‘แžถแž‰โ€‹แž™แž€โ€‹ แž แžพแž™โ€‹แžแŸ‚โ€‹แž€แŸ’แž“แžปแž„โ€‹แžšแž”แŸ€แž”โ€‹โ€‹แž‘แžถแž‰โ€‹แž™แž€โ€‹แž”แŸ‰แžปแžŽแŸ’แžŽแŸ„แŸ‡"
 
@@ -722,7 +730,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "แž–แŸแžแŸŒแž˜แžถแž“โ€‹แžŠแžผแž…แžแž‘แŸ…แž“แŸแŸ‡ แžขแžถแž…แž‡แžฝแž™โ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แžŸแŸ’แžแžถแž“แž—แžถแž–โ€‹แž”แžถแž“ย แŸ–"
 
@@ -770,7 +778,7 @@ msgid ""
 msgstr ""
 "แž—แžถแž–แžขแžŸแŸ’แžšแŸแž™โ€‹แžŠแŸ‚แž›โ€‹แžแžปแžŸโ€‹แž‚แŸ’แž“แžถย แŸ” แž–แŸ’แž™แžถแž™แžถแž˜โ€‹ 'apt-get -f install' แžŠแŸ„แž™โ€‹แž‚แŸ’แž˜แžถแž“โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ (แžฌ แž”แž‰แŸ’แž‡แžถแž€แŸ‹โ€‹แžŠแŸ†แžŽแŸ„แŸ‡แžŸแŸ’แžšแžถแž™)ย แŸ”"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -782,85 +790,85 @@ msgstr ""
 "แžŠแŸ‚แž›แž”แžถแž“โ€‹แž‘แžถแž˜แž‘แžถแžšแž“แžนแž„แž˜แžทแž“แž‘แžถแž“แŸ‹แž”แžถแž“แž”แž„แŸ’แž€แžพแžโ€‹แžกแžพแž™โ€‹\n"
 " แžฌ โ€‹แž”แžถแž“แž™แž€โ€‹แž…แŸแž‰โ€‹แž–แžธแž€แžถแžšแž˜แž€แžŠแž›แŸ‹ย แŸ”"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แžแžผแž…โ€‹"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž”แž“แŸ’แžแŸ‚แž˜โ€‹แžŠแžผแž…แžแž‘แŸ…แž“แŸแŸ‡ แž“แžนแž„แžแŸ’แžšแžผแžœแž”แžถแž“โ€‹แžŠแŸ†แžกแžพแž„ย แŸ–"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แž•แŸ’แžŠแž›แŸ‹โ€‹แž™แŸ„แž”แž›แŸ‹ย แŸ–"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แž•แŸ’แžŠแž›แŸ‹โ€‹แžขแž“แžปแžŸแžถแžŸแž“แŸย แŸ–"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžšแž€โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ %s แž”แžถแž“แž‘แŸ"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "แž”แŸ‰แžปแž“แŸ’แžแŸ‚โ€‹ %s แž“แžนแž„โ€‹แžแŸ’แžšแžผแžœโ€‹แž”แžถแž“โ€‹แžŠแŸ†แžกแžพโ€‹แž„"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แž‚แžŽแž“แžถโ€‹แž€แžถแžšโ€‹แž’แŸ’แžœแžพโ€‹แžฒแŸ’แž™โ€‹แž”แŸ’แžšแžŸแžพแžš... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "แž’แŸ’แžœแžพแžšแžฝแž…โ€‹"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แžแžถแž„แž€แŸ’แž“แžปแž„ แžขแŸ’แž“แž€โ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แž”แž‰แŸ’แž แžถโ€‹แž”แžถแž“แž’แŸ’แžœแžพแžฒแŸ’แž™แžแžผแž…โ€‹แžงแž”แž€แžšแžŽแŸ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž…แžถแž€แŸ‹โ€‹แžŸแŸ„โ€‹แžแžโ€‹แž‘แžถแž‰โ€‹แž™แž€โ€‹แž”แžถแž“โ€‹แžกแžพแž™"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "แž™แŸ‰แžถแž„แž แŸ„แž…แžŽแžถแžŸแŸ‹โ€‹แžแŸ’แžšแžผแžœโ€‹โ€‹แž”แž‰แŸ’แž‡แžถแž€แŸ‹โ€‹โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž˜แžฝแž™ โ€‹แžŠแžพแž˜แŸ’แž”แžธโ€‹แž‘แŸ…โ€‹โ€‹แž”แŸ’แžšแž˜แžผแž›โ€‹แž™แž€โ€‹แž”แŸ’แžšแž—แž–โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžšแž€โ€‹แž€แž‰แŸ’แž…แž”แŸ‹แž”แŸ’แžšแž—แž–โ€‹โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -868,104 +876,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžšแŸ†แž›แž„โ€‹แžฏแž€แžŸแžถแžšโ€‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แž‘แžถแž‰แž™แž€โ€‹แžšแžฝแž…โ€‹ '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "แžขแŸ’แž“แž€โ€‹แž–แžปแŸ†โ€‹แž˜แžถแž“โ€‹แž‘แŸ†แž แŸ†โ€‹แž‘แŸ†แž“แŸแžšโ€‹แž‚แŸ’แžšแž”แŸ‹แž‚แŸ’แžšแžถแž“แŸ‹โ€‹แž‘แŸโ€‹แž“แŸ…แž€แŸ’แž“แžปแž„โ€‹ %s แžกแžพแž™"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "แžแŸ’แžšแžผแžœแž€แžถแžšโ€‹แž™แž€โ€‹ %sB/%sB แž“แŸƒโ€‹แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž”แŸ’แžšแž—แž–ย แŸ”\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "แžแŸ’แžšแžผแžœแž€แžถแžšโ€‹แž™แž€โ€‹ %sB แž“แŸƒโ€‹แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž”แŸ’แžšแž—แž–โ€‹ย แŸ”\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "แž‘แŸ…แž”แŸ’แžšแž˜แžผแž›โ€‹แž”แŸ’แžšแž—แž–โ€‹ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšแž‘แŸ…แž”แŸ’แžšแž˜แžผแž›แž™แž€โ€‹แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž˜แžฝแž™แž…แŸ†แž“แžฝแž“ย แŸ”"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžšแŸ†แž›แž„โ€‹แž€แžถแžšแžŸแŸ’แžšแžถแž™โ€‹แž“แŸƒแž”แŸ’แžšแž—แž–โ€‹แžŠแŸ‚แž›แž”แžถแž“แžŸแŸ’แžšแžถแž™แžšแžฝแž…โ€‹แž“แŸ…แž€แŸ’แž“แžปแž„ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "แž–แžถแž€แŸ’แž™โ€‹แž”แž‰แŸ’แž‡แžถโ€‹แžŸแŸ’แžšแžถแž™ '%s' แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹ย แŸ”\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "แž–แžทแž“แžทแžแŸ’แž™โ€‹แž”แŸ’แžšแžŸแžทแž“โ€‹แž”แžพแž€แž‰แŸ’แž…แž”แŸ‹ 'dpkg-dev' แž˜แžทแž“โ€‹แž‘แžถแž“แŸ‹โ€‹แž”แžถแž“โ€‹แžŠแŸ†แžกแžพแž„โ€‹ย แŸ”\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "แžŸแžถแž„แžŸแž„โ€‹แž–แžถแž€แŸ’แž™โ€‹แž”แž‰แŸ’แž‡แžถโ€‹ '%s' แž”แžถแž“แž”แžšแžถแž‡แŸแž™โ€‹ย แŸ”\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "แžŠแŸ†แžŽแžพแžšโ€‹แž€แžถแžšโ€‹แž€แžผแž“โ€‹แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "แžแŸ’แžšแžผแžœแžแŸ‚โ€‹แž”แž‰แŸ’แž‡แžถแž€แŸ‹โ€‹แž™แŸ‰แžถแž„แž แŸ„แž…แžŽแžถแžŸแŸ‹โ€‹แž˜แžฝแž™แž€แž‰แŸ’แž…แž”แŸ‹แžŠแžพแž˜แŸ’แž”แžธแž–แžทแž“แžทแžแŸ’แž™ builddeps แžŸแž˜แŸ’แžšแžถแž”แŸ‹"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžŸแžถแž„แžŸแž„แŸ‹โ€‹โ€‹แž–แŸแžแŸŒแž˜แžถแž“โ€‹แž—แžถแž–แžขแžŸแŸ’แžšแŸแž™โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s แž˜แžทแž“แž˜แžถแž“แž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™โ€‹แžŸแŸ’แžแžถแž”แž“แžถแžกแžพแž™โ€‹ย แŸ”\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s แž—แžถแž–แžขแžŸแŸ’แžšแŸแž™โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹ %s แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž’แŸ’แžœแžพโ€‹แžฒแŸ’แž™โ€‹แž–แŸแž‰แž…แžทแžแŸ’แžโ€‹ แž–แŸ’แžšแŸ„แŸ‡โ€‹แžšแž€โ€‹โ€‹ %s แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰โ€‹ย "
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s แž—แžถแž–แžขแžŸแŸ’แžšแŸแž™โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹ %s แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž’แŸ’แžœแžพโ€‹แžฒแŸ’แž™โ€‹แž–แŸแž‰แž…แžทแžแŸ’แžโ€‹ แž–แŸ’แžšแŸ„แŸ‡โ€‹แžšแž€โ€‹โ€‹ %s แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰โ€‹ย "
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžแž˜แŸ’แžšแžผแžœแž…แžทแžแŸ’แžแž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™ %s แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %sย แŸ– แž€แž‰แŸ’แž…แž”แŸ‹ %s แžŠแŸ‚แž›แž”แžถแž“แžŠแŸ†แžกแžพแž„ แž‚แžบแžแŸ’แž˜แžธแž–แŸแž€"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -974,37 +982,37 @@ msgstr ""
 "แž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™ %s แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s แž˜แžทแž“แžขแžถแž…โ€‹แžแž˜แŸ’แžšแžผแžœแž…แžทแžแŸ’แžแž”แžถแž“แž‘แŸ แž–แŸ’แžšแŸ„แŸ‡ แž˜แžทแž“แž˜แžถแž“โ€‹แž€แŸ†แžŽแŸ‚โ€‹แž“แŸƒแž€แž‰แŸ’แž…แž”แŸ‹ %s แžŠแŸ‚แž›แžขแžถแž…โ€‹แžแž˜แŸ’แžšแžผแžœแž…แžทแžแŸ’แžโ€‹"
 "แžแž˜แŸ’แžšแžผแžœแž€แžถแžšโ€‹แž€แŸ†แžŽแŸ‚แž”แžถแž“แžกแžพแž™"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s แž—แžถแž–แžขแžŸแŸ’แžšแŸแž™โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹ %s แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž’แŸ’แžœแžพโ€‹แžฒแŸ’แž™โ€‹แž–แŸแž‰แž…แžทแžแŸ’แžโ€‹ แž–แŸ’แžšแŸ„แŸ‡โ€‹แžšแž€โ€‹โ€‹ %s แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰โ€‹ย "
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžแž˜แŸ’แžšแžผแžœแž…แžทแžแŸ’แžแž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™ %s แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "แž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™โ€‹แžŠแŸ‚แž›โ€‹แž”แž„แŸ’แž€แžพแžโ€‹ %s แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แŸ†แž–แŸแž‰โ€‹แžŸแŸแž…แž€แŸ’แžŠแžธโ€‹แžแŸ’แžšแžผแžœแž€แžถแžšโ€‹แž”แžถแž“โ€‹แž‘แŸย แŸ”"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แžŠแŸ†แžŽแžพแžšโ€‹โ€‹แž€แžถแžšโ€‹แž”แž„แŸ’แž€แžพแžโ€‹แž—แžถแž–โ€‹แžขแžถแžŸแŸ’แžšแŸแž™"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž‘แŸ…โ€‹แž€แžถแž“แŸ‹โ€‹ %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "แž˜แŸ‰แžผแžŒแžปแž›โ€‹แžŠแŸ‚แž›โ€‹แž‚แžถแŸ†แž‘แŸ’แžšย แŸ– "
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1089,7 +1097,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1160,7 +1168,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s แž‡แžถแž€แŸ†แžŽแŸ‚โ€‹แžŠแŸ‚แž›แžแŸ’แž˜แžธแž”แŸ†แž•แžปแžแžšแžฝแž…แž‘แŸ…แž แžพแž™ย แŸ”\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "แžšแž„แŸ‹แž…แžถแŸ†แž”แŸ‹โ€‹ %s แž”แŸ‰แžปแž“แŸ’แžแŸ‚ โ€‹แžœแžถโ€‹แž˜แžทแž“โ€‹แž“แŸ…แž‘แžธแž“แŸ„แŸ‡"
@@ -1297,8 +1306,8 @@ msgstr "แžขแžŸแŸ‹แž–แŸแž›โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹"
 msgid "Server closed the connection"
 msgstr "แž˜แŸ‰แžถแžŸแŸŠแžธแž“โ€‹แž”แž˜แŸ’แžšแžพโ€‹แž”แžถแž“โ€‹แž”แžทแž‘โ€‹แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "แž€แžถแžšแžขแžถแž“โ€‹แž˜แžถแž“แž€แŸ†แž แžปแžŸ"
 
@@ -1311,8 +1320,8 @@ msgid "Protocol corruption"
 msgstr "แž€แžถแžšแž”แž„แŸ’แžแžผแž…โ€‹แž–แžทแž’แžธแž€แžถแžšโ€‹"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "แž€แžถแžšแžŸแžšแžŸแŸแžšโ€‹แž˜แžถแž“แž€แŸ†แž แžปแžŸ"
 
@@ -1366,7 +1375,7 @@ msgstr "แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แžšแž“แŸ’แž’โ€‹โ€‹แž‘แžทแž“แŸ’แž“แž“แŸ
 msgid "Unable to accept connection"
 msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แž‘แž‘แžฝแž›แž™แž€โ€‹แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž”แžถแž“แžกแžพแž™"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "แž”แž‰แŸ’แž แžถโ€‹แž’แŸ’แžœแžพแžฒแŸ’แž™แžแžผแž…โ€‹แžฏแž€แžŸแžถแžš"
 
@@ -1393,86 +1402,99 @@ msgstr "แžŸแŸ†แžŽแžฝแžšโ€‹"
 msgid "Unable to invoke "
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž แŸ…โ€‹ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž‘แŸ…โ€‹แž€แžถแž“แŸ‹โ€‹ %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IPย แŸ– %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แž„แŸ’แž€แžพแžโ€‹แžšแž“แŸ’แž’โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s (f=%u t=%u p=%u) แž”แžถแž“แžกแžพแž™"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แž…แžถแž”แŸ‹แž•แŸ’แžŠแžพแž˜โ€‹แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹โ€‹แž‘แŸ…โ€‹แž€แžถแž“แŸ‹โ€‹ %s:%s (%s) แž”แžถแž“แžกแžพแž™ย แŸ”"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž‘แŸ…โ€‹แž€แžถแž“แŸ‹โ€‹ %s:%s (%s) แž”แžถแž“แžกแžพแž™ แž€แžถแžšโ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž”แžถแž“แžขแžŸแŸ‹โ€‹แž–แŸแž›โ€‹"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž‘แŸ…แž€แžถแž“แŸ‹โ€‹ %s:%s (%s) แž”แžถแž“แžกแžพแž™ย แŸ”"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž‘แŸ…แž€แžถแž“แŸ‹ %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹ '%s' แž”แžถแž“แžกแžพแž™"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "แž€แžถแžšโ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แž—แžถแž–โ€‹แž”แžšแžถแž‡แŸแž™โ€‹โ€‹แž”แžŽแŸ’แžแŸ„แŸ‡แžขแžถแžŸแž“แŸ’แž“ '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "แž€แžถแžšโ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แžขแŸ’แžœแžธโ€‹แžขแžถแž€แŸ’แžšแž€แŸ‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แž€แžพแžโ€‹แžกแžพแž„โ€‹ '%s:%s' (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "แž€แžถแžšโ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แžขแŸ’แžœแžธโ€‹แžขแžถแž€แŸ’แžšแž€แŸ‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แž€แžพแžโ€‹แžกแžพแž„โ€‹ '%s:%s' (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž‘แŸ…แž€แžถแž“แŸ‹โ€‹โ€‹ %s %sย แŸ–"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แžแžถแž„แž€แŸ’แž“แžปแž„โ€‹ย แŸ– แž แžแŸ’แžแž›แŸแžแžถโ€‹โ€‹แž›แŸ’แžข แž”แŸ‰แžปแž“แŸ’แžแŸ‚ โ€‹แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แž€แžผแž“แžŸแŸ„โ€‹แžŸแŸ’แž“แžถแž˜โ€‹แž˜แŸ’แžšแžถแž˜แžŠแŸƒย ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "โ€‹แž”แžถแž“แž‡แžฝแž”โ€‹แž”แŸ’แžšแž‘แŸ‡โ€‹โ€‹โ€‹โ€‹แž แžแŸ’แžแž›แŸแžแžถโ€‹แž™แŸ‰แžถแž„แž แŸ„แž…แžŽแžถแžŸแŸ‹แž˜แžฝแž™ แžŠแŸ‚โ€‹แž›แžแŸ’แžšแžนแž˜แžแŸ’แžšแžผแžœโ€‹ย แŸ”"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แŸ’แžšแžแžทแž”แžแŸ’แžแžท '%s' แžŠแžพแž˜แŸ’แž”แžธโ€‹แž•แŸ’แž‘แŸ€แž„แž•แŸ’แž‘แžถแžแŸ‹โ€‹แž แžแŸ’แžแž›แŸแžแžถ (แžแžพ gpgv แžแŸ’แžšแžผแžœโ€‹แž”แžถแž“โ€‹แžŠแŸ†แžกแžพแž„โ€‹แžฌแž“แŸ…ย ?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "แž˜แžทแž“แžŸแŸ’แž‚แžถแž›แŸ‹แž€แŸ†แž แžปแžŸ แž€แŸ’แž“แžปแž„แž€แžถแžšแž”แŸ’แžšแžแžทแž”แžแŸ’แžแžท gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "แž แžแŸ’แžแž›แŸแžแžถโ€‹แžแžถแž„โ€‹แž€แŸ’แžšแŸ„แž˜โ€‹แž˜แžทแž“โ€‹แžแŸ’แžšแžนแž˜แžแŸ’แžšแžผแžœย แŸ–\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1510,53 +1532,53 @@ msgstr "แž˜แŸ‰แžถแžŸแŸŠแžธแž“โ€‹แž”แž˜แŸ’แžšแžพ HTTP แž“แŸแŸ‡แž”แžถแž“โ€‹แžแžผ
 msgid "Unknown date format"
 msgstr "แž˜แžทแž“แžŸแŸ’แž‚แžถแž›แŸ‹โ€‹แž‘แŸ’แžšแž„แŸ‹แž‘แŸ’แžšแžถแž™โ€‹แž€แžถแž›แž”แžšแžทแž…แŸ’แž†แŸแž‘"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "แž‡แŸ’แžšแžพแžŸโ€‹แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž”แžถแž“โ€‹แžขแžŸแŸ‹แž–แŸแž›โ€‹"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžŸแžšแžŸแŸแžšแž‘แŸ…แž€แžถแž“แŸ‹โ€‹แžฏแž€แžŸแžถแžšแž›แž‘แŸ’แž’แž•แž›"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžŸแžšแžŸแŸแžšแž‘แŸ…แž€แžถแž“แŸ‹โ€‹แžฏแž€แžŸแžถแžš"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "แž€แŸ†แž แžปแžŸแž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžŸแžšแžŸแŸแžšโ€‹แž‘แŸ…แž€แžถแž“แŸ‹โ€‹แžฏแž€แžŸแžถแžš"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžขแžถแž“โ€‹แž–แžธโ€‹แž˜แŸ‰แžถแžŸแŸŠแžธแž“แž”แž˜แŸ’แžšแžพย แŸ” แž€แžถแžšแž”แž‰แŸ’แž…แž”แŸ‹โ€‹แž–แžธแž…แž˜แŸ’แž„แžถแž™โ€‹แž”แžถแž“แž”แžทแž‘แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšแžขแžถแž“โ€‹แž–แžธโ€‹แž˜แŸ‰แžถแžŸแŸŠแžธแž“โ€‹แž”แž˜แŸ’แžšแžพ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "แž‘แžทแž“แŸ’แž“แž“แŸแž™โ€‹แž”แž‹แž˜แž€แžแžถโ€‹แžแžผแž…"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "แž€แžถแžšแžแž—แŸ’แž‡แžถแž”แŸ‹โ€‹แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แžแžถแž„โ€‹แž€แŸ’แž“แžปแž„โ€‹"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžขแžถแž“โ€‹ %s แž”แžถแž“แžกแžพแž™"
@@ -1583,7 +1605,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹ %s แž”แžถแž“แžกแžพแž™"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1675,7 +1702,7 @@ msgstr ""
 "  -c=? แžขแžถแž“โ€‹แžฏแž€แžŸแžถแžšโ€‹แž€แžถแžšโ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžšแž…แž“แžถแžŸแŸ’แž–แŸแž“แŸ’แž’โ€‹แž“แŸแŸ‡\n"
 "  -o=? แž€แŸ†แžŽแžแŸ‹โ€‹แž‡แž˜แŸ’แžšแžพแžŸโ€‹แž€แžถแžšโ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžšแž…แž“แžถโ€‹แžŸแž˜แŸ’แž–แŸแž“แŸ’แž’โ€‹แžแžถแž˜โ€‹แž…แžทแžแŸ’แž แžง. eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžŸแžšแžŸแŸแžšโ€‹แž‘แŸ… %s"
@@ -1822,8 +1849,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹ DB แž”แžถแž“แž‘แŸ %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšแžแŸ’แž›แŸ‚แž„  %s"
@@ -1836,87 +1863,87 @@ msgstr "แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž‚แŸ’แž˜แžถแž“โ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžแŸ’แžš
 msgid "Unable to get a cursor"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž™แž€โ€‹แž‘แžŸแŸ’แžŸแž“แŸแž‘แŸ’แžšแž“แžทแž…โ€‹"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžขแžถแž“โ€‹แžแž %s แž”แžถแž“โ€‹แžกแžพแž™\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Wย แŸ– แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžแŸ’แž›แŸ‚แž„ %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: แž€แŸ†แž แžปแžŸโ€‹แžขแž“แžปแžœแžแŸ’แžโ€‹แž›แžพโ€‹แžฏแž€แžŸแžถแžšโ€‹"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™ %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "แž˜แŸ‚แž€โ€‹แž’แžถแž„ แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แžพแž€ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แžขแžถแž“โ€‹แžแŸ†แžŽโ€‹ %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž•แŸ’แžŠแžถแž…แŸ‹ %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แžโ€‹ %s แž‘แŸ… %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink แž€แŸ†แžŽแžแŸ‹โ€‹แž“แŸƒโ€‹แž€แžถแžšโ€‹แžœแžถแž™ %sBย แŸ”\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž‚แŸ’แž˜แžถแž“โ€‹แžœแžถแž›โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s แž‚แŸ’แž˜แžถแž“โ€‹แž’แžถแžแžปแž’แžถแžแžปแž”แž‰แŸ’แž…แžผแž›โ€‹โ€‹แž”แžŠแžทแžŸแŸแž’แžกแžพแž™\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  แžขแŸ’แž“แž€โ€‹แžแŸ‚แž‘แžถแŸ† %s แž‚แžบ %s แž˜แžทแž“แž˜แŸ‚แž“โ€‹ %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s แž‚แŸ’แž˜แžถแž“โ€‹แž’แžถแžแžปโ€‹แž”แžŠแžทแžŸแŸแž’โ€‹แž”แŸ’แžšแž—แž–\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s แž‚แŸ’แž˜แžถแž“โ€‹แž’แžถแžแžปแž”โ€‹แžŠแžทแžŸแŸแž’แž‚แŸ„แž›โ€‹แž–แžธแžšโ€‹แžŠแŸ‚แžš\n"
@@ -1990,7 +2017,7 @@ msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšแžขแžถแž“โ€‹
 msgid "Problem unlinking %s"
 msgstr "แž˜แžถแž“แž”แž‰แŸ’แž แžถโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แž•แŸ’แžŠแžถแž…แŸ‹แžแŸ†แžŽ %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แŸ’แžแžผแžšโ€‹แžˆแŸ’แž˜แŸ„แŸ‡ %s แž‘แŸ… %s"
@@ -2048,23 +2075,23 @@ msgstr ""
 "  -c=? แžขแžถแž“โ€‹แžฏแž€แžŸแžถแžšโ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžšแž…แž“แžถแžŸแž˜แŸ’แž–แŸแž“แŸ’แž’แž“แŸแŸ‡โ€‹\n"
 "  -o=? แž€แŸ†แžŽแžแŸ‹โ€‹แž‡แž˜แŸ’แžšแžพแžŸโ€‹แž€แžถแžšโ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžšแž…แž“แžถโ€‹แžŸแž˜แŸ’แž–แŸแž“แŸ’แž’โ€‹แžแžถแž˜โ€‹แž…แžทแžแŸ’แž แžง. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แž„แŸ’แž€แžพแžโ€‹แž”แŸ†แž–แž„แŸ‹โ€‹"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แŸ’แžšแžแžทแž”แžแŸ’แžแžท gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž”แžถแž“โ€‹แžแžผแž…โ€‹"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar แž†แŸแž€แžŸแžถแŸ†โ€‹แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™ แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แž”แžถแž“โ€‹แžแžผแž…"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "แž˜แžทแž“โ€‹แžŸแŸ’แž‚แžถแž›แŸ‹โ€‹แž”แŸ’แžšแž—แŸแž‘โ€‹แž”แž‹แž˜แž€แžแžถโ€‹ TAR  %u แžŠแŸ‚แž›แž‡แžถโ€‹แžŸแž˜แžถแž‡แžทแž€โ€‹ %s"
@@ -2135,54 +2162,54 @@ msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžŸแžšแžŸแŸแžšโ€‹แžฏแž€
 msgid "Failed to close file %s"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แž”แžทแž‘แžฏแž€แžŸแžถแžš %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "แž•แŸ’แž›แžผแžœโ€‹ %s แžœแŸ‚แž„โ€‹แž–แŸแž€"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แž–แž“แŸ’แž›แžถโ€‹ %s แž…แŸ’แžšแžพแž“โ€‹แž‡แžถแž„โ€‹แž˜แŸ’แžแž„โ€‹"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "แžแžโ€‹ %s แžแŸ’แžšแžผแžœแž”แžถแž“โ€‹แž”แž„แŸ’แžœแŸ‚แžš"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹ โ€‹แž€แŸ†แž–แžปแž„โ€‹แž–แŸ’แž™แžถแž™แžถแž˜โ€‹แžŸแžšแžŸแŸแžšโ€‹แž‘แŸ…แž€แžถแž“แŸ‹โ€‹แž‚แŸ„แž›แžŠแŸ…โ€‹แž”แž„แŸ’แžœแŸ‚แžšโ€‹ %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "แž•แŸ’แž›แžผแžœโ€‹แž”แž„แŸ’แžœแŸ‚แžš แžœแŸ‚แž„แž–แŸแž€"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "แžแžโ€‹ %s แžแŸ’แžšแžผแžœโ€‹แž”แžถแž“โ€‹แž‡แŸ†แž“แžฝแžŸโ€‹แžŠแŸ„แž™โ€‹แž˜แžทแž“แž˜แŸ‚แž“โ€‹แž‡แžถโ€‹แžแžโ€‹"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžŠแžถแž€แŸ‹แžแŸ’แž“แžถแŸ†แž„โ€‹แž“แŸ…แž€แŸ’แž“แžปแž„โ€‹แž’แžปแž„โ€‹แžšแžถแž™แž”แŸ‰แžถแž™โ€‹แžšแž”แžŸแŸ‹แžœแžถ"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "แž•แŸ’แž›แžผแžœโ€‹แžœแŸ‚แž„โ€‹แž–แŸแž€"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "แžŸแžšแžŸแŸแžšโ€‹แž‡แžถแž“แŸ‹โ€‹แž›แžพแž€แž‰แŸ’แž…แž”แŸ‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹แžŠแŸ„แž™โ€‹แž‚แŸ’แž˜แžถแž“โ€‹แž€แŸ†แžŽแŸ‚โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹ %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "แžฏแž€แžŸแžถแžšโ€‹ %s/%s แžŸแžšแžŸแŸแžšแž‡แžถแž“แŸ‹โ€‹แž–แžธแž›แžพโ€‹แž˜แžฝแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžแŸ’แž›แŸ‚แž„ %s แž”แžถแž“แžกแžพแž™"
@@ -2261,30 +2288,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "แž‡แž˜แŸ’แžšแžพแžŸโ€‹ %s แžšแž€โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰โ€‹แžกแžพแž™"
@@ -2354,6 +2381,16 @@ msgstr "%c%s... แž€แŸ†แž แžปแžŸย โ€‹!"
 msgid "%c%s... Done"
 msgstr "%c%s... แž’แŸ’แžœแžพแžšแžฝแž…โ€‹"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... แž’แŸ’แžœแžพแžšแžฝแž…โ€‹"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2414,114 +2451,120 @@ msgstr "แž”แžšแžถแž‡แŸแž™แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แžแŸ’แž›แŸ‚แž„ แžŸแŸŠแžธแž
 msgid "Problem closing the gzip file %s"
 msgstr "แž˜แžถแž“โ€‹แž”แž‰แŸ’แž แžถโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แž”แžทแž‘โ€‹แžฏแž€แžŸแžถแžš"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "แž˜แžทแž“โ€‹แž”แŸ’แžšแžพแž”แŸ’แžšแžถแžŸแŸ‹โ€‹แž€แžถแžšแž…แžถแž€แŸ‹แžŸแŸ„ แžŸแž˜แŸ’แžšแžถแž”แŸ‹แžแŸ‚แžฏแž€แžŸแžถแžšแž…แžถแž€แŸ‹แžŸแŸ„โ€‹แžŠแŸ‚แž›แž”แžถแž“แžแŸ‚แžขแžถแž“แž”แŸ‰แžปแžŽแŸ’แžŽแŸ„แŸ‡ %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹แž…แžถแž€แŸ‹แžŸแŸ„โ€‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "แž˜แžทแž“แž”แŸ’แžšแžพโ€‹แž€แžถแžšแž…แžถแž€แŸ‹แžŸแŸ„ แžŸแž˜แŸ’แžšแžถแž”แŸ‹ nfs แžฏแž€แžŸแžถแžšโ€‹แž…แžถแž€แŸ‹แžŸแŸ„แžŠแŸ‚แž›แž”แžถแž“แž˜แŸ‰แŸ„แž“%s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž…แžถแž€แŸ‹แžŸแŸ„ %s แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แžšแž„โ€‹ %s แž”แžถแž“โ€‹แž‘แž‘แžฝแž›โ€‹แž€แŸ†แž แžปแžŸโ€‹แž€แžถแžšโ€‹แž…แŸ‚แž€แž‡แžถแž…แž˜แŸ’แžšแŸ€แž€โ€‹ย แŸ”"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แžšแž„โ€‹ %s แž”แžถแž“โ€‹แž‘แž‘แžฝแž›โ€‹แž€แŸ†แž แžปแžŸโ€‹แž€แžถแžšโ€‹แž…แŸ‚แž€แž‡แžถแž…แž˜แŸ’แžšแŸ€แž€โ€‹ย แŸ”"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แžšแž„โ€‹ %s แž”แžถแž“แžแŸ’แžšแžกแž”แŸ‹โ€‹แž‘แŸ…แž€แžถแž“แŸ‹โ€‹แž€แžผแžŠโ€‹แž˜แžถแž“โ€‹แž€แŸ†แž แžปแžŸโ€‹ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แžšแž„โ€‹ %s แž”แžถแž“แž…แŸแž‰ แžŠแŸ„แž™โ€‹แž˜แžทแž“โ€‹แžšแŸ†แž–แžนแž„โ€‹แž‘แžปแž€โ€‹ย "
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แž”แŸ†แž–แžปแž„โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แž„แŸ’แž€แžพแžโ€‹แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แžšแž„โ€‹ IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹แž”แŸ’แžšแžแžทแž”แžแŸ’แžแžทโ€‹แž€แž˜แŸ’แž˜แžœแžทแž’แžธโ€‹แž”แž„แŸ’แž แžถแž”แŸ‹ "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "แžขแžถแž“โ€‹, แž“แŸ…แžแŸ‚โ€‹แž˜แžถแž“ %lu แžŠแžพแž˜แŸ’แž”แžธโ€‹แžขแžถแž“โ€‹ แž”แŸ‰แžปแž“แŸ’แžแŸ‚โ€‹แž‚แŸ’แž˜แžถแž“โ€‹แžขแŸ’แžœแžธโ€‹แž“แŸ…แžŸแž›แŸ‹"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "แžŸแžšแžŸแŸแžšโ€‹, แž“แŸ…แžแŸ‚แž˜แžถแž“โ€‹ %lu แžŠแžพแž˜แŸ’แž”แžธโ€‹แžŸแžšแžŸแŸแžšโ€‹ แž”แŸ‰แžปแž“แŸ’แžแŸ‚โ€‹แž˜แžทแž“โ€‹แžขแžถแž…โ€‹"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "แž˜แžถแž“โ€‹แž”แž‰แŸ’แž แžถโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แž”แžทแž‘โ€‹แžฏแž€แžŸแžถแžš"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "แž˜แžถแž“แž”แž‰แŸ’แž แžถโ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšแž’แŸ’แžœแžพโ€‹แžŸแž˜แž€แžถแž›แž€แž˜แŸ’แž˜แžฏแž€แžŸแžถแžšโ€‹"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "แž˜แžถแž“แž”แž‰แŸ’แž แžถโ€‹แž€แŸ’แž“แžปแž„แž€แžถแžšโ€‹แž•แŸ’แžŠแžถแž…แŸ‹แžแŸ†แžŽโ€‹แžฏแž€แžŸแžถแžš"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "แž˜แžถแž“แž”แž‰แŸ’แž แžถโ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšแž’แŸ’แžœแžพโ€‹แžŸแž˜แž€แžถแž›แž€แž˜แŸ’แž˜แžฏแž€แžŸแžถแžšโ€‹"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "แž€แŸ†แž–แžปแž„โ€‹แž”แŸ„แŸ‡แž”แž„แŸ‹โ€‹แž€แžถแžšโ€‹แžŠแŸ†แžกแžพแž„โ€‹ย แŸ”"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "แžƒแŸ’แž›แžถแŸ†แž„โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž‘แž‘แŸโ€‹"
@@ -2548,59 +2591,59 @@ msgstr "APT แž“แŸแŸ‡ แž˜แžทแž“แž‚แžถแŸ†แž‘แŸ’แžšโ€‹แž”แŸ’แžšแž–แŸแž“แŸ’แž’โ€‹
 msgid "The package cache was built for a different architecture"
 msgstr "แžƒแŸ’แž›แžถแŸ†แž„โ€‹แžŸแž˜แŸ’แž„แžถแžแŸ‹โ€‹แž€แž‰แŸ’แž…แž”แŸ‹แžแŸ’แžšแžผแžœโ€‹แž”แžถแž“แžŸแŸ’แžแžถแž”แž“แžถแŸ‹โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹แžŸแŸ’แžแžถแž”แžแŸ’แž™แž€แžšโ€‹แžแžปแžŸโ€‹แŸ—แž‚แŸ’แž“แžถโ€‹โ€‹"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "แžขแžถแžŸแŸ’แžšแŸแž™โ€‹"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "แžขแžถแžŸแŸ’แžšแŸแž™แž‡แžถโ€‹แž˜แžปแž“"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "แž•แŸ’แžŠแž›แŸ‹แž™แŸ„แž”แž›แŸ‹โ€‹"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "แž•แŸ’แžแž›แŸ‹โ€‹แžขแž“แžปแžŸแžถแžŸแž“แŸโ€‹"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "แž”แŸ‰แŸ‡แž‘แž„แŸ’แž‚แžทแž…"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "แž‡แŸ†แž“แžฝแžŸโ€‹"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "แž›แŸ‚แž„โ€‹แž”แŸ’แžšแžพ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "แžŸแŸ†แžแžถแž“แŸ‹โ€‹"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "แž”แžถแž“โ€‹แž‘แžถแž˜แž‘แžถแžš"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "แž‚แŸ†แžšแžผ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "แžŸแŸ’แžšแŸแž…แž…แžทแžแŸ’แž"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "แž”แž“แŸ’แžแŸ‚แž˜"
 
@@ -2701,29 +2744,29 @@ msgstr "แž€แŸ†แž–แžปแž„โ€‹แž”แžพแž€โ€‹ %s"
 msgid "Line %u too long in source list %s."
 msgstr "แž”แž“แŸ’แž‘แžถแžแŸ‹โ€‹ %u แž˜แžถแž“โ€‹แž”แŸ’แžšแžœแŸ‚แž„โ€‹แžœแŸ‚แž„แž–แŸแž€แž“แŸ…โ€‹แž€แŸ’แž“แžปแž„โ€‹แž”แž‰แŸ’แž‡แžธโ€‹แž”แŸ’แžšแž—แž–โ€‹ %sย แŸ”"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "แž”แž“แŸ’แž‘แžถแžแŸ‹โ€‹ Malformed  %u แž€แŸ’แž“แžปแž„โ€‹แž”แž‰แŸ’แž‡แžธโ€‹แž”แŸ’แžšแž—แž–โ€‹ %s (แž”แŸ’แžšแž—แŸแž‘โ€‹)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "แž”แŸ’แžšแž—แŸแž‘โ€‹ '%s' แž˜แžทแž“โ€‹แžŸแŸ’แž‚แžถแž›แŸ‹แž“แŸ…แž›แžพแž”แž“แŸ’แž‘แžถแžแŸ‹โ€‹ %u แž€แŸ’แž“แžปแž„โ€‹แž”แž‰แŸ’แž‡แžธโ€‹แž”แŸ’แžšแž—แž–โ€‹ %s แžกแžพแž™"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2745,7 +2788,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹ %s แžแŸ’แžšแžผแžœแž€แžถแžšแžฒแŸ’แž™แžŠแŸ†แžกแžพแž„ แž”แŸ‰แžปแž“แŸ’แžแŸ‚โ€‹ แžแŸ’แž‰แžปแŸ†โ€‹แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžšแž€โ€‹แž”แŸแžŽแŸ’แžŽแžŸแžถแžšโ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แžœแžถโ€‹แž”แžถแž“โ€‹แž‘แŸโ€‹ย แŸ”"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2753,11 +2796,11 @@ msgstr ""
 "แž€แŸ†แž แžปแžŸ pkgProblemResolver::แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แžŸแž‰แŸ’แž‰แžถแž”แž‰แŸ’แžˆแž”แŸ‹โ€‹แžŠแŸ‚แž›แž”แžถแž“แž”แž„แŸ’แž€แžพแž แž“แŸแŸ‡โ€‹แž”แŸ’แžšแž แŸ‚แž›แž‡แžถ แž”แž„แŸ’แž€แžŠแŸ„แž™แž€แž‰แŸ’แž…แž”แŸ‹โ€‹"
 "แžŠแŸ‚แž›แž”แžถแž“โ€‹แž‘แžปแž€ย แŸ”"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž€แŸ‚โ€‹แž”แž‰แŸ’แž แžถแž”แžถแž“แž‘แŸแŸ แžขแŸ’แž€แž”แžถแž“แž‘แžปแž€โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžŠแŸ‚แž›โ€‹แžแžผแž…ย แŸ”แŸ”"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2765,7 +2808,7 @@ msgid ""
 msgstr ""
 "แžฏแž€แžŸแžถแžšโ€‹แž›แžทแž”แžทแž€แŸ’แžšแž˜โ€‹แž˜แžฝแž™โ€‹แž…แŸ†แž“แžฝแž“โ€‹แž”แžถแž“โ€‹แž”แžšแžถแž‡แŸแž™โ€‹แž€แŸ’แž“แžปแž„โ€‹แž€แžถแžšโ€‹โ€‹แž‘แžถแž‰โ€‹แž™แž€ โ€‹แž–แžฝแž€แžœแžถแžแŸ’แžšแžผแžœแž”แžถแž“โ€‹แž˜แžทแž“โ€‹แžขแžพแž–แžพโ€‹ แžฌ แž”แŸ’แžšแžพโ€‹โ€‹แžฏแž€แžŸแžถแžšโ€‹แž…แžถแžŸแŸ‹โ€‹แž‡แŸ†แž“แžฝแžŸแžœแžทแž‰ย โ€‹โ€‹แŸ”"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "แžšแžถแž™แž”แž‰แŸ’แž‡แžธโ€‹แžแžโ€‹ %spartial แž‚แžบโ€‹แž”แžถแžแŸ‹แž”แž„แŸ‹โ€‹ย แŸ”"
@@ -2802,17 +2845,17 @@ msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แžšแž€แžƒแžพแž‰โ€‹แž€แž˜แŸ’แž˜แžœแžทแž’แžธโ€‹แž”แž‰
 msgid "Method %s did not start correctly"
 msgstr "แžœแžทแž’แžธแžŸแžถแžŸแŸ’แžแŸ’แžšโ€‹ %s แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž…แžถแž”แŸ‹โ€‹แž•แŸ’แžแžพแž˜โ€‹แžแŸ’แžšแžนแž˜แžแŸ’แžšแžผแžœโ€‹แž‘แŸโ€‹"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "แžŸแžผแž˜โ€‹แž”แž‰แŸ’แž…แžผแž›โ€‹แžŸแŸ’แž›แžถแž€โ€‹แžŒแžธแžŸโ€‹ย แŸ– '%s' แž€แŸ’แž“แžปแž„โ€‹แžŠแŸ’แžšแžถแž™โ€‹ '%s' แž แžพแž™โ€‹แžŸแž„แŸ’แž€แžแŸ‹โ€‹แž…แžผแž›ย แŸ”"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "แž˜แžทแž“โ€‹แž‚แžถแŸ†แž‘แŸ’แžšโ€‹แž”แŸ’แžšแž–แŸแž“แŸ’แž’โ€‹แž€แž‰แŸ’แž…แž”แŸ‹'%s' แžกแžพแž™"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แž”แŸ’แžšแž—แŸแž‘โ€‹แž”แŸ’แžšแž–แŸแž“แŸ’แž’โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžŠแŸ‚แž›โ€‹แžŸแž˜แžšแž˜แŸ’แž™โ€‹แž”แžถแž“แžกแžพแž™"
 
@@ -2865,14 +2908,14 @@ msgstr "แžƒแŸ’แž›แžถแŸ†แž„แžŸแž˜แŸ’แž„แžถแžแŸ‹โ€‹แž˜แžทแž“โ€‹แžแŸ’แžšแžผแžœโ€‹
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "แž€แŸ†แž แžปแžŸโ€‹แž”แžถแž“แž€แžพแžแžกแžพแž„โ€‹แžแžŽแŸˆแž–แŸแž›โ€‹แž€แŸ†แž–แžปแž„โ€‹แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹ %s (FindPkg)"
@@ -2894,26 +2937,26 @@ msgstr "แžขแžŸแŸ’แž…แžถแžšแŸ’แž™ แžขแŸ’แž“แž€โ€‹แž˜แžถแž“โ€‹แž€แŸ†แžŽแŸ‚โ€‹แž›แž
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "แžขแžŸแŸ’แž…แžถแžšแŸ’แž™โ€‹, แžขแŸ’แž“แž€โ€‹แž˜แžถแž“โ€‹แž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™โ€‹แž›แžพแžŸโ€‹แž…แŸ†แž“แžฝแž“โ€‹ APT แž“แŸแŸ‡โ€‹แž†แž”แž‚แŸ’แž“แžถโ€‹ย แŸ”"
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹ %s %s แžšแž€โ€‹แž˜แžทแž“โ€‹แžƒแžพแž‰โ€‹แžแžŽแŸˆโ€‹แž–แŸแž›โ€‹แž€แŸ†แž–แžปแž„โ€‹แžŠแŸ†แžŽแžพแžšแž€แžถแžšโ€‹แž—แžถแž–แžขแžถแžŸแŸ’แžšแŸแž™โ€‹โ€‹แžฏแž€แžŸแžถแžš"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "แž˜แžทแž“แžขแžถแž…แžแŸ’แž›แŸ‚แž„ แž”แž‰แŸ’แž‡แžธโ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž”แŸ’แžšแž—แž–แž…แž”แŸ‹โ€‹ แž”แžถแž“แžกแžพแž™ %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžขแžถแž“โ€‹แž”แž‰แŸ’แž‡แžธโ€‹แž€แž‰แŸ’แž…แž”แŸ‹"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "แž€แžถแžšแž•แŸ’แžŠแž›แŸ‹โ€‹แžฏแž€แžŸแžถแžšโ€‹แž”แŸ’แžšแž˜แžผแž›แž•แŸ’แžŠแžปแŸ†"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO แž€แŸ†แž แžปแžŸแž€แŸ’แž“แžปแž„แž€แžถแžšแžšแžšแž€แŸ’แžŸแžถแž‘แžปแž€โ€‹แžƒแŸ’แž›แžถแŸ†แž„โ€‹แžŸแž˜แŸ’แž„แžถแžแŸ‹โ€‹แž”แŸ’แžšแž—แž–โ€‹"
 
@@ -2926,54 +2969,54 @@ msgstr "แž”แŸ’แžแžผแžšโ€‹แžˆแŸ’แž˜แŸ„แŸ‡โ€‹แž”แžถแž“แž”แžšแžถแž‡แŸแž™โ€‹, %s (
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum แž˜แžทแž“โ€‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum แž˜แžทแž“โ€‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แž‰แŸ‚แž€โ€‹แžฏแž€แžŸแžถแžšแž€แž‰แŸ’แž…แž”แŸ‹ %s (1) แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "แž‚แŸ’แž˜แžถแž“โ€‹แž€แžผแž“แžŸแŸ„โ€‹แžŸแžถแž’แžถแžšแžŽแŸˆโ€‹แžขแžถแž…โ€‹แžšแž€โ€‹แž”แžถแž“โ€‹แž€แŸ’แž“แžปแž„แž€แžผแž“แžŸแŸ„ IDs แžแžถแž„แž€แŸ’แžšแŸ„แž˜โ€‹แž“แŸแŸ‡แž‘แŸย แŸ–\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2982,7 +3025,7 @@ msgstr ""
 "แžแŸ’แž‰แžปแŸ†โ€‹แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžšแž€แž‘แžธแžแžถแŸ†แž„โ€‹แžฏแž€แžŸแžถแžšโ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ %s แž”แžถแž“โ€‹แž‘แŸย แŸ” โ€‹แž˜แžถแž“โ€‹แž“แŸแž™โ€‹แžแžถโ€‹แžขแŸ’แž“แž€โ€‹แžแŸ’แžšแžผแžœแž€แžถแžšโ€‹แž‡แžฝแžŸแž‡แžปแž›โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž“แŸแŸ‡โ€‹แžŠแŸ„แž™โ€‹แžŠแŸƒย แŸ” "
 "(แžŠแŸ„แž™แžŸแžถแžšโ€‹โ€‹แž”แžถแžแŸ‹โ€‹แžŸแŸ’แžแžถแž”แžแŸ’แž™แž€แž˜แŸ’แž˜)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2990,37 +3033,37 @@ msgid ""
 msgstr ""
 "แžแŸ’แž‰แžปแŸ†โ€‹แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แžšแž€แž‘แžธแžแžถแŸ†แž„โ€‹แžฏแž€แžŸแžถแžšโ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แž€แž‰แŸ’แž…แž”แŸ‹ %s แž”แžถแž“แž‘แŸย แŸ” โ€‹แž˜แžถแž“โ€‹แž“แŸแž™โ€‹แžแžถโ€‹แžขแŸ’แž“แž€โ€‹แžแŸ’แžšแžผแžœแž€แžถแžšโ€‹แž‡แžฝแžŸแž‡แžปแž›โ€‹แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แž“แŸแŸ‡โ€‹แžŠแŸ„แž™โ€‹แžŠแŸƒ แŸ”"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แž€แž‰แŸ’แž…แž”แŸ‹โ€‹แžฏแž€แžŸแžถแžšโ€‹แž›แžทแž”แžทแž€แŸ’แžšแž˜โ€‹แžแŸ’แžšแžผแžœโ€‹แž”แžถแž“โ€‹แžแžผแž…ย แŸ” แž‚แŸ’แž˜แžถแž“โ€‹แžˆแŸ’แž˜แŸ„แŸ‡โ€‹แžฏแž€แžŸแžถแžšย แŸ– แžœแžถแž›โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แž€แž‰แŸ’แž…แž”แŸ‹แž“แŸแŸ‡โ€‹แž‘แŸโ€‹ %sย แŸ”"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "แž‘แŸ†แž แŸ†โ€‹แž˜แžทแž“แž”แžถแž“โ€‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แž‰แŸ‚แž€โ€‹แžฏแž€แžŸแžถแžšแž€แž‰แŸ’แž…แž”แŸ‹ %s (1) แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "แž…แŸ†แžŽแžถแŸ† แž€แŸ†แž–แžปแž„โ€‹แž‡แŸ’แžšแžพแžŸโ€‹ %s แž‡แŸ†แž“แžฝแžŸโ€‹ %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "แž”แž“แŸ’แž‘แžถแžแŸ‹โ€‹แžŠแŸ‚แž›แž˜แžทแž“แžแŸ’แžšแžนแž˜แžแŸ’แžšแžผแžœโ€‹แž“แŸ…แž€แŸ’แž“แžปแž„โ€‹แžฏแž€แžŸแžถแžšโ€‹แž”แž„แŸ’แžœแŸ‚แžšย แŸ– %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "แž˜แžทแž“แžขแžถแž…โ€‹แž‰แŸ‚แž€โ€‹แžฏแž€แžŸแžถแžšแž€แž‰แŸ’แž…แž”แŸ‹ %s (1) แž”แžถแž“แžกแžพแž™"
@@ -3048,7 +3091,7 @@ msgstr "แž€แŸ†แž–แžปแž„โ€‹แž’แŸ’แžœแžพแžขแžแŸ’แžแžŸแž‰แŸ’แž‰แžถแžŽแž“แžถโ€‹..
 msgid "Stored label: %s\n"
 msgstr "แž”แžถแž“แž‘แžปแž€โ€‹แžŸแŸ’แž›แžถแž€ย แŸ– %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "แž˜แžทแž“แž€แŸ†แž–แžปแž„แž˜แŸ‰แŸ„แž“ แžŸแŸŠแžธแžŒแžธโ€‹-แžšแŸ‰แžผแž˜โ€‹ แž‘แŸ..."
@@ -3109,30 +3152,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แž…แž˜แŸ’แž›แž„โ€‹แž”แž‰แŸ’แž‡แžธโ€‹แž€แž‰แŸ’แž…แž”แŸ‹..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "แž€แŸ†แž–แžปแž„แžŸแžšแžŸแŸแžšโ€‹แž”แž‰แŸ’แž‡แžธโ€‹แž”แŸ’แžšแž—แž–โ€‹แžแŸ’แž˜แžธ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "แž’แžถแžแžปแž”แž‰แŸ’แž…แžผแž›โ€‹แž”แž‰แŸ’แž‡แžธแž”แŸ’แžšแž—แž–โ€‹แžŸแž˜แŸ’แžšแžถแž”แŸ‹โ€‹แžŒแžธแžŸโ€‹แž“แŸแŸ‡แž‚แžบย แŸ–\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "แž”แžถแž“แžŸแžšแžŸแŸแžš %i แž€แŸ†แžŽแžแŸ‹แžแŸ’แžšแžถย แŸ”\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "แž”แžถแž“แžŸแžšแžŸแŸแžš %i แž€แŸ†แžŽแžแŸ‹แžแŸ’แžšแžถโ€‹แž‡แžถแž˜แžฝแž™โ€‹ %i แžฏแž€แžŸแžถแžšโ€‹แžŠแŸ‚แž›โ€‹แž”แžถแžแŸ‹แž”แž„แŸ‹ย แŸ”\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "แž”แžถแž“แžŸแžšแžŸแŸแžšโ€‹ %i แž€แŸ†แžŽแžแŸ‹แžแŸ’แžšแžถโ€‹แž‡แžถแž˜แžฝแž™แžฝแž™โ€‹ %i แžฏแž€แžŸแžถแžšโ€‹แžŠแŸ‚แž›โ€‹แž˜แžทแž“โ€‹แž”แžถแž“โ€‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "แž”แžถแž“แžŸแžšแžŸแŸแžš %i แž€แŸ†แžŽแžแŸ‹แžแŸ’แžšแžถโ€‹แž‡แžถแž˜แžฝแž™โ€‹ %i แžฏแž€แžŸแžถแžšโ€‹แžŠแŸ‚แž›โ€‹แž”แžถแžแŸ‹แž”แž„แŸ‹โ€‹ แž“แžทแž„โ€‹ %i แžฏแž€แžŸแžถแžšโ€‹แžŠแŸ‚แž›โ€‹แž˜แžทแž“โ€‹แž”แžถแž“โ€‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹ย โ€‹\n"
@@ -3147,17 +3190,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum แž˜แžทแž“โ€‹แž•แŸ’แž‚แžฝแž•แŸ’แž‚แž„โ€‹"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "แž€แŸ†แž–แžปแž„โ€‹แž”แŸ„แŸ‡แž”แž„แŸ‹โ€‹แž€แžถแžšโ€‹แžŠแŸ†แžกแžพแž„โ€‹ย แŸ”"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3221,119 +3253,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "แž”แžถแž“โ€‹แžŠแŸ†แžกแžพแž„ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แž€แŸ†แžŽแžแŸ‹โ€‹แžšแž…แž“แžถโ€‹แžŸแž˜แŸ’แž–แŸแž“แŸ’แž’ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แž™แž€ %s แž…แŸแž‰"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "แž”แžถแž“โ€‹แž™แž€ %s แž…แŸแž‰โ€‹แž‘แžถแŸ†แž„โ€‹แžŸแŸ’แžšแžปแž„"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "แžšแžถแž™แž”แž‰แŸ’แž‡แžธโ€‹แžแžโ€‹ %spartial แž‚แžบโ€‹แž”แžถแžแŸ‹แž”แž„แŸ‹โ€‹ย แŸ”"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "แž˜แžทแž“โ€‹แžขแžถแž…โ€‹แž”แžพแž€โ€‹แžฏแž€แžŸแžถแžšโ€‹ %s แž”แžถแž“แžกแžพแž™"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "แž€แŸ†แž–แžปแž„แžšแŸ€แž”แž…แŸ†โ€‹ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžŸแŸ’แžšแžถแž™ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "แž€แŸ†แž–แžปแž„แžšแŸ€แž”แž…แŸ†โ€‹แž€แŸ†แžŽแžแŸ‹แžšแž…แž“แžถแžŸแž˜แŸ’แž–แŸแž“แŸ’แž’ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "แž”แžถแž“โ€‹แžŠแŸ†แžกแžพแž„ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "แž€แŸ†แž–แžปแž„แžšแŸ€แž”แž…แŸ†แžŠแžพแž˜แŸ’แž”แžธโ€‹แž€แžถแžšแž™แž€โ€‹แž…แŸแž‰โ€‹แž“แŸƒ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "แž”แžถแž“โ€‹แž™แž€ %s แž…แŸแž‰"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "แž€แŸ†แž–แžปแž„โ€‹แžšแŸ€แž”แž…แŸ†โ€‹แž™แž€ %s แž…แŸแž‰โ€‹แž‘แžถแŸ†แž„โ€‹แžŸแŸ’แžšแžปแž„"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "แž”แžถแž“โ€‹แž™แž€ %s แž…แŸแž‰โ€‹แž‘แžถแŸ†แž„โ€‹แžŸแŸ’แžšแžปแž„"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3345,13 +3377,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3381,14 +3407,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "แž€แžถแžšโ€‹แžŠแŸ„แŸ‡แžŸแŸ’แžšแžถแž™โ€‹แžขแŸ’แžœแžธโ€‹แžขแžถแž€แŸ’แžšแž€แŸ‹แžŠแŸ‚แž›โ€‹แž”แžถแž“โ€‹แž€แžพแžโ€‹แžกแžพแž„โ€‹ '%s:%s' (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... แž’แŸ’แžœแžพแžšแžฝแž…โ€‹"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "แž€แŸ†แž–แžปแž„โ€‹แž”แžพโ€‹แžฏแž€แžŸแžถแžšโ€‹แž€แŸ†แžŽแžแŸ‹แžšแž…แž“แžถแžŸแž˜แŸ’แž–แŸแž“แŸ’แž’โ€‹ %s"
 
diff --git a/po/ko.po b/po/ko.po
index c67210c44..5f5332b20 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -93,72 +93,72 @@ msgstr "์ฐจ์ง€ํ•˜๋Š” ์ „์ฒด ์šฉ๋Ÿ‰: "
 msgid "Package file %s is out of sync."
 msgstr "ํŒจํ‚ค์ง€ ํŒŒ์ผ %s ํŒŒ์ผ์ด ๋™๊ธฐํ™”๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ํŒจํ‚ค์ง€๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "์ตœ์†Œ ํ•œ ๊ฐœ์˜ ๊ฒ€์ƒ‰์–ด๋ฅผ ์ง€์ •ํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ํŒจํ‚ค์ง€ ํŒŒ์ผ:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "์บ์‹œ๊ฐ€ ๋™๊ธฐํ™”๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค. ํŒจํ‚ค์ง€ ํŒŒ์ผ์„ ์ƒํ˜ธ ์ฐธ์กฐํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ํ•€ ํŒจํ‚ค์ง€:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(์—†์Œ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ์„ค์น˜: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ํ›„๋ณด: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(์—†์Œ)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ํŒจํ‚ค์ง€ ํ•€: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ๋ฒ„์ „ ํ…Œ์ด๋ธ”:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), ์ปดํŒŒ์ผ ์‹œ๊ฐ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -232,20 +232,28 @@ msgstr ""
 "  -o=? ์ž„์˜์˜ ์˜ต์…˜์„ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. ์˜ˆ๋ฅผ ๋“ค์–ด -o dir::cache=/tmp\n"
 "์ข€ ๋” ์ž์„ธํ•œ ์ •๋ณด๋Š” apt-cache(8) ๋ฐ apt.conf(5) ๋งค๋‰ด์–ผ ํŽ˜์ด์ง€๋ฅผ ๋ณด์‹ญ์‹œ์˜ค.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "์ด ๋””์Šคํฌ์˜ ์ด๋ฆ„์„ ์ •ํ•˜์‹ญ์‹œ์˜ค (์˜ˆ: 'Debian 5.0.3 Disk 1')"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "๋“œ๋ผ์ด๋ธŒ์— ๋””์Šคํฌ๋ฅผ ๋„ฃ๊ณ  Enter๋ฅผ ๋ˆ„๋ฅด์‹ญ์‹œ์˜ค"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s ํŒŒ์ผ์˜ ์ด๋ฆ„์„ %s(์œผ)๋กœ ๋ฐ”๊พธ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ํ˜„์žฌ ๊ฐ–๊ณ  ์žˆ๋Š” ๋‹ค๋ฅธ CD์—๋„ ์ด ๊ณผ์ •์„ ๋ฐ˜๋ณตํ•˜์‹ญ์‹œ์˜ค."
 
@@ -479,7 +487,7 @@ msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ๋‹ค์‹œ ์„ค์น˜ํ•˜๋Š” ๊ฑด ๋ถˆ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค. ๋‹ค์šด๋กœ๋“œ
 msgid "%s is already the newest version.\n"
 msgstr "%s ํŒจํ‚ค์ง€๋Š” ์ด๋ฏธ ์ตœ์‹  ๋ฒ„์ „์ž…๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ํŒจํ‚ค์ง€ ์ˆ˜๋™์„ค์น˜๋กœ ์ง€์ •ํ•ฉ๋‹ˆ๋‹ค.\n"
@@ -589,8 +597,8 @@ msgstr "์ด ์ž‘์—… ํ›„ %s๋ฐ”์ดํŠธ์˜ ๋””์Šคํฌ ๊ณต๊ฐ„์„ ๋” ์‚ฌ์šฉํ•˜๊ฒŒ ๋ฉ๋‹
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "์ด ์ž‘์—… ํ›„ %s๋ฐ”์ดํŠธ์˜ ๋””์Šคํฌ ๊ณต๊ฐ„์ด ๋น„์›Œ์ง‘๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s์˜ ์—ฌ์œ  ๊ณต๊ฐ„์˜ ํฌ๊ธฐ๋ฅผ ํŒŒ์•…ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
@@ -632,7 +640,7 @@ msgstr "์ค‘๋‹จ."
 msgid "Do you want to continue [Y/n]? "
 msgstr "๊ณ„์† ํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s ํŒŒ์ผ์„ ๋ฐ›๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค  %s\n"
@@ -641,7 +649,7 @@ msgstr "%s ํŒŒ์ผ์„ ๋ฐ›๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค  %s\n"
 msgid "Some files failed to download"
 msgstr "์ผ๋ถ€ ํŒŒ์ผ์„ ๋ฐ›๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "๋‹ค์šด๋กœ๋“œ๋ฅผ ๋งˆ์ณค๊ณ  ๋‹ค์šด๋กœ๋“œ ์ „์šฉ ๋ชจ๋“œ์ž…๋‹ˆ๋‹ค"
 
@@ -722,7 +730,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "์ด ์ƒํ™ฉ์„ ํ•ด๊ฒฐํ•˜๋Š”๋ฐ ๋‹ค์Œ ์ •๋ณด๊ฐ€ ๋„์›€์ด ๋  ์ˆ˜๋„ ์žˆ์Šต๋‹ˆ๋‹ค:"
 
@@ -768,7 +776,7 @@ msgstr ""
 "์˜์กด์„ฑ์ด ๋งž์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ํŒจํ‚ค์ง€ ์—†์ด 'apt-get -f install'์„ ์‹œ๋„ํ•ด ๋ณด์‹ญ์‹œ์˜ค "
 "(์•„๋‹ˆ๋ฉด ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•์„ ์ง€์ •ํ•˜์‹ญ์‹œ์˜ค)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -779,78 +787,78 @@ msgstr ""
 "๋ถˆ์•ˆ์ • ๋ฐฐํฌํŒ์„ ์‚ฌ์šฉํ•ด์„œ ์ผ๋ถ€ ํ•„์š”ํ•œ ํŒจํ‚ค์ง€๋ฅผ ์•„์ง ๋งŒ๋“ค์ง€ ์•Š์•˜๊ฑฐ๋‚˜,\n"
 "์•„์ง Incoming์—์„œ ๋‚˜์˜ค์ง€ ์•Š์€ ๊ฒฝ์šฐ์ผ ์ˆ˜๋„ ์žˆ์Šต๋‹ˆ๋‹ค."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "๋ง๊ฐ€์ง„ ํŒจํ‚ค์ง€"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "๋‹ค์Œ ํŒจํ‚ค์ง€๋ฅผ ๋” ์„ค์น˜ํ•  ๊ฒƒ์ž…๋‹ˆ๋‹ค:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "์ œ์•ˆํ•˜๋Š” ํŒจํ‚ค์ง€:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "์ถ”์ฒœํ•˜๋Š” ํŒจํ‚ค์ง€:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ํŒจํ‚ค์ง€๋Š” ์ˆ˜๋™์„ค์น˜๋กœ ์ง€์ •ํ•ฉ๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "์—…๊ทธ๋ ˆ์ด๋“œ๋ฅผ ๊ณ„์‚ฐํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "์‹คํŒจ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "์™„๋ฃŒ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "๋‚ด๋ถ€ ์˜ค๋ฅ˜, ๋ฌธ์ œ ํ•ด๊ฒฐ ํ”„๋กœ๊ทธ๋žจ์ด ๋ฌด์–ธ๊ฐ€๋ฅผ ๋ง๊ฐ€๋œจ๋ ธ์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "๋‹ค์šด๋กœ๋“œ ๋””๋ ‰ํ„ฐ๋ฆฌ๋ฅผ ์ž ๊ธ€ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "ํ•ด๋‹น๋˜๋Š” ์†Œ์Šค ํŒจํ‚ค์ง€๋ฅผ ๊ฐ€์ ธ์˜ฌ ํŒจํ‚ค์ง€๋ฅผ ์ตœ์†Œํ•œ ํ•˜๋‚˜ ์ง€์ •ํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s์˜ ์†Œ์Šค ํŒจํ‚ค์ง€๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -859,7 +867,7 @@ msgstr ""
 "์•Œ๋ฆผ: '%s' ํŒจํ‚ค์ง•์€ ๋‹ค์Œ '%s' ๋ฒ„์ „ ์ปจํŠธ๋กค ์‹œ์Šคํ…œ์—์„œ ๊ด€๋ฆฌํ•ฉ๋‹ˆ๋‹ค:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -870,85 +878,85 @@ msgstr ""
 "๋‹ค์Œ๊ณผ ๊ฐ™์ด ํ•˜์‹ญ์‹œ์˜ค:\n"
 "bzr get %s\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "์ด๋ฏธ ๋‹ค์šด๋กœ๋“œ ๋ฐ›์€ ํŒŒ์ผ '%s'์€(๋Š”) ๋‹ค์‹œ ๋ฐ›์ง€ ์•Š๊ณ  ๊ฑด๋„ˆ ๋œ๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s์— ์ถฉ๋ถ„ํ•œ ๊ณต๊ฐ„์ด ์—†์Šต๋‹ˆ๋‹ค"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "์†Œ์Šค ์•„์นด์ด๋ธŒ๋ฅผ %s๋ฐ”์ดํŠธ/%s๋ฐ”์ดํŠธ ๋ฐ›์•„์•ผ ํ•ฉ๋‹ˆ๋‹ค.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "์†Œ์Šค ์•„์นด์ด๋ธŒ๋ฅผ %s๋ฐ”์ดํŠธ ๋ฐ›์•„์•ผ ํ•ฉ๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s ์†Œ์Šค๋ฅผ ๊ฐ€์ ธ์˜ต๋‹ˆ๋‹ค\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "์ผ๋ถ€ ์•„์นด์ด๋ธŒ๋ฅผ ๊ฐ€์ ธ์˜ค๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s์— ์ด๋ฏธ ํ’€๋ ค ์žˆ๋Š” ์†Œ์Šค์˜ ์••์ถ•์„ ํ’€์ง€ ์•Š๊ณ  ๊ฑด๋„ˆ ๋œ๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "์••์ถ• ํ’€๊ธฐ ๋ช…๋ น '%s' ์‹คํŒจ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' ํŒจํ‚ค์ง€๊ฐ€ ์„ค์น˜๋˜์—ˆ๋Š”์ง€๋ฅผ ํ™•์ธํ•˜์‹ญ์‹œ์˜ค.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "๋นŒ๋“œ ๋ช…๋ น '%s' ์‹คํŒจ.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ํ•˜์œ„ ํ”„๋กœ์„ธ์Šค๊ฐ€ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ํ•ด๋‹น๋˜๋Š” ๋นŒ๋“œ ์˜์กด์„ฑ์„ ๊ฒ€์‚ฌํ•  ํŒจํ‚ค์ง€๋ฅผ ์ตœ์†Œํ•œ ํ•˜๋‚˜ ์ง€์ •ํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s์˜ ๋นŒ๋“œ ์˜์กด์„ฑ ์ •๋ณด๋ฅผ ๊ฐ€์ ธ์˜ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ํŒจํ‚ค์ง€์— ๋นŒ๋“œ ์˜์กด์„ฑ์ด ์—†์Šต๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -957,7 +965,7 @@ msgstr ""
 "%2$s์— ๋Œ€ํ•œ %1$s ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. %3$s ํŒจํ‚ค์ง€๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ"
 "๋‹ค"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -966,14 +974,14 @@ msgstr ""
 "%2$s์— ๋Œ€ํ•œ %1$s ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. %3$s ํŒจํ‚ค์ง€๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ"
 "๋‹ค"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s์— ๋Œ€ํ•œ %1$s ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ค๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค: ์„ค์น˜ํ•œ %3$s ํŒจํ‚ค์ง€๊ฐ€ ๋„ˆ"
 "๋ฌด ์ตœ๊ทผ ๋ฒ„์ „์ž…๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -982,7 +990,7 @@ msgstr ""
 "%2$s์— ๋Œ€ํ•œ %1$s ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. %3$s ํŒจํ‚ค์ง€์˜ ์‚ฌ์šฉ ๊ฐ€๋Šฅํ•œ ๋ฒ„"
 "์ „ ์ค‘์—์„œ๋Š” ์ด ๋ฒ„์ „ ์š”๊ตฌ์‚ฌํ•ญ์„ ๋งŒ์กฑ์‹œํ‚ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -991,30 +999,30 @@ msgstr ""
 "%2$s์— ๋Œ€ํ•œ %1$s ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. %3$s ํŒจํ‚ค์ง€๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ"
 "๋‹ค"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s์— ๋Œ€ํ•œ %1$s ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ค๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค: %3$s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s์˜ ๋นŒ๋“œ ์˜์กด์„ฑ์„ ๋งŒ์กฑ์‹œํ‚ค์ง€ ๋ชปํ–ˆ์Šต๋‹ˆ๋‹ค."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "๋นŒ๋“œ ์˜์กด์„ฑ์„ ์ฒ˜๋ฆฌํ•˜๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s(%s)์— ์—ฐ๊ฒฐํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "์ง€์›ํ•˜๋Š” ๋ชจ๋“ˆ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1102,7 +1110,7 @@ msgstr ""
 "apt.conf(5) ๋งค๋‰ด์–ผ ํŽ˜์ด์ง€๋ฅผ ๋ณด์‹ญ์‹œ์˜ค.\n"
 "                       ์ด APT๋Š” Super Cow Powers๋กœ ๋ฌด์žฅํ–ˆ์Šต๋‹ˆ๋‹ค.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1177,7 +1185,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ํŒจํ‚ค์ง€๋Š” ์ด๋ฏธ ์ตœ์‹  ๋ฒ„์ „์ž…๋‹ˆ๋‹ค.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s ํ”„๋กœ์„ธ์Šค๋ฅผ ๊ธฐ๋‹ค๋ ธ์ง€๋งŒ ํ•ด๋‹น ํ”„๋กœ์„ธ์Šค๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค"
@@ -1315,8 +1324,8 @@ msgstr "์—ฐ๊ฒฐ ์‹œ๊ฐ„ ์ดˆ๊ณผ"
 msgid "Server closed the connection"
 msgstr "์„œ๋ฒ„์—์„œ ์—ฐ๊ฒฐ์„ ๋‹ซ์•˜์Šต๋‹ˆ๋‹ค"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "์ฝ๊ธฐ ์˜ค๋ฅ˜"
 
@@ -1329,8 +1338,8 @@ msgid "Protocol corruption"
 msgstr "ํ”„๋กœํ† ์ฝœ์ด ํ‹€๋ ธ์Šต๋‹ˆ๋‹ค"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "์“ฐ๊ธฐ ์˜ค๋ฅ˜"
 
@@ -1384,7 +1393,7 @@ msgstr "๋ฐ์ดํ„ฐ ์†Œ์ผ“ ์—ฐ๊ฒฐ ์‹œ๊ฐ„ ์ดˆ๊ณผ"
 msgid "Unable to accept connection"
 msgstr "์—ฐ๊ฒฐ์„ ๋ฐ›์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ํŒŒ์ผ ํ•ด์‹ฑ์— ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
@@ -1411,86 +1420,99 @@ msgstr "์งˆ์˜"
 msgid "Unable to invoke "
 msgstr "๋‹ค์Œ์„ ์‹คํ–‰ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s(%s)์— ์—ฐ๊ฒฐํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s์— ๋Œ€ํ•œ ์†Œ์ผ“์„ ๋งŒ๋“ค ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s์— ์—ฐ๊ฒฐ์„ ์ดˆ๊ธฐํ™”ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s์— ์—ฐ๊ฒฐํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค (%s). ์—ฐ๊ฒฐ ์ œํ•œ ์‹œ๊ฐ„์ด ์ดˆ๊ณผํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s์— ์—ฐ๊ฒฐํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s์— ์—ฐ๊ฒฐํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'์˜ ์ฃผ์†Œ๋ฅผ ์•Œ์•„๋‚ผ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'์˜ ์ฃผ์†Œ๋ฅผ ์•Œ์•„๋‚ด๋Š”๋ฐ ์ž„์‹œ๋กœ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "'%s:%s'์˜ ์ฃผ์†Œ๋ฅผ ์•Œ์•„๋‚ด๋Š”๋ฐ ๋ฌด์–ธ๊ฐ€ ์ด์ƒํ•œ ์ผ์ด ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s'์˜ ์ฃผ์†Œ๋ฅผ ์•Œ์•„๋‚ด๋Š”๋ฐ ๋ฌด์–ธ๊ฐ€ ์ด์ƒํ•œ ์ผ์ด ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s์— ์—ฐ๊ฒฐํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "๋‚ด๋ถ€ ์˜ค๋ฅ˜: ์„œ๋ช…์€ ์˜ฌ๋ฐ”๋ฅด์ง€๋งŒ ํ‚ค ํ•‘๊ฑฐํ”„๋ฆฐํŠธ๋ฅผ ํ™•์ธํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "์ตœ์†Œํ•œ ํ•˜๋‚˜ ์ด์ƒ์˜ ์„œ๋ช…์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "์„œ๋ช…์„ ํ™•์ธํ•˜๋Š” 'gpgv' ํ”„๋กœ๊ทธ๋žจ์„ ์‹คํ–‰ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. (gpgv๋ฅผ ์„ค์น˜ํ–ˆ์Šต๋‹ˆ๊นŒ?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "gpgv ์‹คํ–‰ ๋„์ค‘ ์•Œ ์ˆ˜ ์—†๋Š” ์˜ค๋ฅ˜ ๋ฐœ์ƒ"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "๋‹ค์Œ ์„œ๋ช…์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1528,53 +1550,53 @@ msgstr "HTTP ์„œ๋ฒ„์— ๋ฒ”์œ„ ์ง€์› ๊ธฐ๋Šฅ์ด ์ž˜๋ชป๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค"
 msgid "Unknown date format"
 msgstr "๋ฐ์ดํ„ฐ ํ˜•์‹์„ ์•Œ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "select๊ฐ€ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "์—ฐ๊ฒฐ ์‹œ๊ฐ„์ด ์ดˆ๊ณผํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "์ถœ๋ ฅ ํŒŒ์ผ์— ์“ฐ๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ํŒŒ์ผ์— ์“ฐ๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ํ•ด๋‹น ํŒŒ์ผ์— ์“ฐ๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "์„œ๋ฒ„์—์„œ ์ฝ๊ณ  ์—ฐ๊ฒฐ์„ ๋‹ซ๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "์„œ๋ฒ„์—์„œ ์ฝ๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ํ—ค๋” ๋ฐ์ดํ„ฐ๊ฐ€ ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "์—ฐ๊ฒฐ์ด ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "๋‚ด๋ถ€ ์˜ค๋ฅ˜"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s์„(๋ฅผ) ์ฝ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
@@ -1601,7 +1623,12 @@ msgstr "'%s' ๋ฏธ๋Ÿฌ ํŒŒ์ผ์ด ์—†์Šต๋‹ˆ๋‹ค "
 msgid "Can not read mirror file '%s'"
 msgstr "'%s' ๋ฏธ๋Ÿฌ ํŒŒ์ผ์ด ์—†์Šต๋‹ˆ๋‹ค "
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "'%s' ๋ฏธ๋Ÿฌ ํŒŒ์ผ์ด ์—†์Šต๋‹ˆ๋‹ค "
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[๋ฏธ๋Ÿฌ ์‚ฌ์ดํŠธ: %s]"
@@ -1696,7 +1723,7 @@ msgstr ""
 "  -c=? ์„ค์ • ํŒŒ์ผ์„ ์ฝ์Šต๋‹ˆ๋‹ค\n"
 "  -o=? ์ž„์˜์˜ ์˜ต์…˜์„ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. ์˜ˆ๋ฅผ ๋“ค์–ด -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s์— ์“ธ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
@@ -1842,8 +1869,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "DB ํŒŒ์ผ, %s ํŒŒ์ผ์„ ์—ด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s์˜ ์ •๋ณด๋ฅผ ์ฝ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
@@ -1857,88 +1884,88 @@ msgstr "์•„์นด์ด๋ธŒ์— ์ปจํŠธ๋กค ๊ธฐ๋ก์ด ์—†์Šต๋‹ˆ๋‹ค"
 msgid "Unable to get a cursor"
 msgstr "์ปค์„œ๋ฅผ ๊ฐ€์ ธ์˜ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "๊ฒฝ๊ณ : %s ๋””๋ ‰ํ„ฐ๋ฆฌ๋ฅผ ์ฝ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "๊ฒฝ๊ณ : %s์˜ ์ •๋ณด๋ฅผ ์ฝ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "์˜ค๋ฅ˜: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "๊ฒฝ๊ณ : "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "์˜ค๋ฅ˜: ๋‹ค์Œ ํŒŒ์ผ์— ์ ์šฉํ•˜๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค: "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s์˜ ๊ฒฝ๋กœ๋ฅผ ์•Œ์•„๋‚ด๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ํŠธ๋ฆฌ์—์„œ ์ด๋™์ด ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s ํŒŒ์ผ์„ ์—ฌ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
 # FIXME: ??
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " ๋งํฌ %s [%s] ์—†์• ๊ธฐ\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s ํŒŒ์ผ์— readlinkํ•˜๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s ํŒŒ์ผ์„ ์ง€์šฐ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s ํŒŒ์ผ์„ %s์— ๋งํฌํ•˜๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink ํ•œ๊ณ„๊ฐ’ %s๋ฐ”์ดํŠธ์— ๋„๋‹ฌํ–ˆ์Šต๋‹ˆ๋‹ค.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "์•„์นด์ด๋ธŒ์— ํŒจํ‚ค์ง€ ํ•„๋“œ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s์—๋Š” override ํ•ญ๋ชฉ์ด ์—†์Šต๋‹ˆ๋‹ค\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ๊ด€๋ฆฌ์ž๊ฐ€ %s์ž…๋‹ˆ๋‹ค (%s ์•„๋‹˜)\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s์—๋Š” source override ํ•ญ๋ชฉ์ด ์—†์Šต๋‹ˆ๋‹ค\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s์—๋Š” binary override ํ•ญ๋ชฉ์ด ์—†์Šต๋‹ˆ๋‹ค\n"
@@ -2012,7 +2039,7 @@ msgstr "MD5๋ฅผ ๊ณ„์‚ฐํ•˜๋Š” ๋™์•ˆ ์ฝ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 msgid "Problem unlinking %s"
 msgstr "%s์˜ ๋งํฌ๋ฅผ ํ•ด์ œํ•˜๋Š”๋ฐ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s ํŒŒ์ผ์˜ ์ด๋ฆ„์„ %s(์œผ)๋กœ ๋ฐ”๊พธ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
@@ -2071,23 +2098,23 @@ msgstr ""
 "  -c=? ์ด ์„ค์ • ํŒŒ์ผ์„ ์ฝ์Šต๋‹ˆ๋‹ค\n"
 "  -o=? ์ž„์˜์˜ ์˜ต์…˜์„ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. ์˜ˆ๋ฅผ ๋“ค์–ด -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ํŒŒ์ดํ”„ ๋งŒ๋“ค๊ธฐ๊ฐ€ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "gzip ์‹คํ–‰์ด ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "์•„์นด์ด๋ธŒ๊ฐ€ ์†์ƒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "tar ์ฒดํฌ์„ฌ ์‹คํŒจ, ์•„์นด์ด๋ธŒ๊ฐ€ ์†์ƒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "์•Œ ์ˆ˜ ์—†๋Š” TAR ํ—ค๋” ํƒ€์ž… %u, ๋ฉค๋ฒ„ %s"
@@ -2158,54 +2185,54 @@ msgstr "%s ํŒŒ์ผ์„ ์“ฐ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 msgid "Failed to close file %s"
 msgstr "%s ํŒŒ์ผ์„ ๋‹ซ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "๊ฒฝ๋กœ %s์ด(๊ฐ€) ๋„ˆ๋ฌด ๊น๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s์„(๋ฅผ) ๋‘ ๋ฒˆ ์ด์ƒ ํ’€์—ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s ๋””๋ ‰ํ„ฐ๋ฆฌ๊ฐ€ ์ „ํ™˜๋˜์—ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "์ด ํŒจํ‚ค์ง€์—์„œ ์ „ํ™˜๋œ ๋Œ€์ƒ์— ์“ฐ๋ ค๊ณ  ํ•ฉ๋‹ˆ๋‹ค (%s/%s)"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "์ „ํ™˜ํ•˜๋Š” ๊ฒฝ๋กœ๊ฐ€ ๋„ˆ๋ฌด ๊น๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s ๋””๋ ‰ํ„ฐ๋ฆฌ๋ฅผ ๋””๋ ‰ํ„ฐ๋ฆฌ๊ฐ€ ์•„๋‹Œ ํŒŒ์ผ๋กœ ๋ฎ์–ด์“ฐ๋ ค๊ณ  ํ•ฉ๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ํ•ด์‹œ ๋ฒ„ํ‚ท์—์„œ ๋…ธ๋“œ๋ฅผ ์ฐพ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "๊ฒฝ๋กœ๊ฐ€ ๋„ˆ๋ฌด ๊น๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "๋ฎ์–ด ์“ฐ๋Š” ํŒจํ‚ค์ง€๊ฐ€ %s ํŒจํ‚ค์ง€์˜ ์–ด๋–ค ๋ฒ„์ „๊ณผ๋„ ๋งž์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s ํŒŒ์ผ์€ %s ํŒจํ‚ค์ง€์— ์žˆ๋Š” ํŒŒ์ผ์„ ๋ฎ์–ด ์”๋‹ˆ๋‹ค"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s์˜ ์ •๋ณด๋ฅผ ์ฝ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
@@ -2284,30 +2311,30 @@ msgstr ""
 "mmap ํฌ๊ธฐ๋ฅผ ๋Š˜๋ฆด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ž๋™์œผ๋กœ ๋Š˜๋ฆฌ๋Š” ๊ธฐ๋Šฅ์„ ์‚ฌ์šฉ์ž๊ฐ€ ๊ธˆ์ง€ํ–ˆ์Šต๋‹ˆ๋‹ค."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%li์ผ %li์‹œ๊ฐ„ %li๋ถ„ %li์ดˆ"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%li์‹œ๊ฐ„ %li๋ถ„ %li์ดˆ"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%li๋ถ„ %li์ดˆ"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%li์ดˆ"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "์„ ํƒํ•œ %s์ด(๊ฐ€) ์—†์Šต๋‹ˆ๋‹ค"
@@ -2377,6 +2404,16 @@ msgstr "%c%s... ์˜ค๋ฅ˜!"
 msgid "%c%s... Done"
 msgstr "%c%s... ์™„๋ฃŒ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ์™„๋ฃŒ"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2437,114 +2474,120 @@ msgstr "CD-ROM์˜ ์ •๋ณด๋ฅผ ์ฝ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 msgid "Problem closing the gzip file %s"
 msgstr "%s gzip ํŒŒ์ผ์„ ๋‹ซ๋Š”๋ฐ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "์ฝ๊ธฐ ์ „์šฉ ์ž ๊ธˆ ํŒŒ์ผ %s์— ๋Œ€ํ•ด ์ž ๊ธˆ์„ ์‚ฌ์šฉํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "์ž ๊ธˆ ํŒŒ์ผ %s ํŒŒ์ผ์„ ์—ด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "NFS๋กœ ๋งˆ์šดํŠธ๋œ ์ž ๊ธˆ ํŒŒ์ผ %s์— ๋Œ€ํ•ด ์ž ๊ธˆ์„ ์‚ฌ์šฉํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s ์ž ๊ธˆ ํŒŒ์ผ์„ ์–ป์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ํ•˜์œ„ ํ”„๋กœ์„ธ์Šค %s ํ”„๋กœ์„ธ์Šค๊ฐ€ ์„ธ๊ทธ๋ฉ˜ํ…Œ์ด์…˜ ์˜ค๋ฅ˜๋ฅผ ๋ฐ›์•˜์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ํ•˜์œ„ ํ”„๋กœ์„ธ์Šค %s ํ”„๋กœ์„ธ์Šค๊ฐ€ %u๋ฒˆ ์‹œ๊ทธ๋„์„ ๋ฐ›์•˜์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ํ•˜์œ„ ํ”„๋กœ์„ธ์Šค %s ํ”„๋กœ์„ธ์Šค๊ฐ€ ์˜ค๋ฅ˜ ์ฝ”๋“œ(%u)๋ฅผ ๋ฆฌํ„ดํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ํ•˜์œ„ ํ”„๋กœ์„ธ์Šค %s ํ”„๋กœ์„ธ์Šค๊ฐ€ ์˜ˆ์ƒ์น˜ ๋ชปํ•˜๊ฒŒ ๋๋‚ฌ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s ํŒŒ์ผ์„ ์—ด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%d ํŒŒ์ผ ๋””์Šคํฌ๋ฆฝํ„ฐ๋ฅผ ์—ด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ํ•˜์œ„ ํ”„๋กœ์„ธ์Šค IPC๋ฅผ ๋งŒ๋“œ๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "๋‹ค์Œ ์••์ถ• ํ”„๋กœ๊ทธ๋žจ์„ ์‹คํ–‰ํ•˜๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค: "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "%lu๋งŒํผ ๋” ์ฝ์–ด์•ผ ํ•˜์ง€๋งŒ ๋” ์ด์ƒ ์ฝ์„ ๋ฐ์ดํ„ฐ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "%lu๋งŒํผ ๋” ์จ์•ผ ํ•˜์ง€๋งŒ ๋” ์ด์ƒ ์“ธ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "%s ํŒŒ์ผ์„ ๋‹ซ๋Š”๋ฐ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s ํŒŒ์ผ์„ %s(์œผ)๋กœ ์ด๋ฆ„์„ ๋ฐ”๊พธ๋Š”๋ฐ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "%s ํŒŒ์ผ์„ ์‚ญ์ œํ•˜๋Š”๋ฐ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ํŒŒ์ผ์„ ๋™๊ธฐํ™”ํ•˜๋Š”๋ฐ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s์— ํ‚ค ๋ชจ์Œ์„ ์„ค์น˜ํ•˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ํŒจํ‚ค์ง€ ์บ์‹œ๊ฐ€ ๋น„์–ด ์žˆ์Šต๋‹ˆ๋‹ค"
@@ -2571,59 +2614,59 @@ msgstr "์ด APT๋Š” '%s' ๋ฒ„์ „ ์‹œ์Šคํ…œ์„ ์ง€์›ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 msgid "The package cache was built for a different architecture"
 msgstr "ํŒจํ‚ค์ง€ ์บ์‹œ๊ฐ€ ๋‹ค๋ฅธ ์•„ํ‚คํ…์ณ์šฉ์ž…๋‹ˆ๋‹ค."
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "์˜์กด"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "๋ฏธ๋ฆฌ์˜์กด"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "์ œ์•ˆ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "์ถ”์ฒœ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "์ถฉ๋Œ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "๋Œ€์ฒด"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "์—†์•ฐ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "๋ง๊ฐ€๋œจ๋ฆผ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "ํ–ฅ์ƒ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "์ค‘์š”"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ํ•„์ˆ˜"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ํ‘œ์ค€"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "์˜ต์…˜"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "๋ณ„๋„"
 
@@ -2724,17 +2767,17 @@ msgstr "%s ํŒŒ์ผ์„ ์—ฌ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 msgid "Line %u too long in source list %s."
 msgstr "์†Œ์Šค ๋ฆฌ์ŠคํŠธ %2$s์˜ %1$u๋ฒˆ ์ค„์ด ๋„ˆ๋ฌด ๊น๋‹ˆ๋‹ค."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "์†Œ์Šค ๋ฆฌ์ŠคํŠธ %2$s์˜ %1$u๋ฒˆ ์ค„์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค (ํƒ€์ž…)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "์†Œ์Šค ๋ชฉ๋ก %3$s์˜ %2$u๋ฒˆ ์ค„์˜ '%1$s' ํƒ€์ž…์„ ์•Œ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2743,12 +2786,12 @@ msgstr ""
 "'%s'์— ๋Œ€ํ•ด ์ฆ‰์‹œ ์„ค์ •์„ ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ž์„ธํ•œ ์„ค๋ช…์€ man 5 apt.conf ํŽ˜์ด์ง€์—"
 "์„œ APT::Immediate-Configure ํ•ญ๋ชฉ์„ ๋ณด์‹ญ์‹œ์˜ค. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "'%s' ํŒŒ์ผ์„ ์—ด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2771,7 +2814,7 @@ msgid ""
 msgstr ""
 "%s ํŒจํ‚ค์ง€๋ฅผ ๋‹ค์‹œ ์„ค์น˜ํ•ด์•ผ ํ•˜์ง€๋งŒ, ์ด ํŒจํ‚ค์ง€์˜ ์•„์นด์ด๋ธŒ๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2779,11 +2822,11 @@ msgstr ""
 "์˜ค๋ฅ˜, pkgProblemResolver::Resolve๊ฐ€ ๋ง๊ฐ€์กŒ์Šต๋‹ˆ๋‹ค. ๊ณ ์ • ํŒจํ‚ค์ง€๋•Œ๋ฌธ์— ๋ฐœ์ƒํ•  ์ˆ˜"
 "๋„ ์žˆ์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "๋ฌธ์ œ๋ฅผ ๋ฐ”๋กœ์žก์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ๋ง๊ฐ€์ง„ ๊ณ ์ • ํŒจํ‚ค์ง€๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2792,7 +2835,7 @@ msgstr ""
 "์ผ๋ถ€ ์ธ๋ฑ์Šค ํŒŒ์ผ์„ ๋‹ค์šด๋กœ๋“œํ•˜๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค. ํ•ด๋‹น ํŒŒ์ผ์„ ๋ฌด์‹œํ•˜๊ฑฐ๋‚˜ ๊ณผ๊ฑฐ"
 "์˜ ๋ฒ„์ „์„ ๋Œ€์‹  ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "๋ชฉ๋ก ๋””๋ ‰ํ„ฐ๋ฆฌ %spartial์ด ๋น ์กŒ์Šต๋‹ˆ๋‹ค."
@@ -2829,18 +2872,18 @@ msgstr "์„ค์น˜ ๋ฐฉ๋ฒ• ๋“œ๋ผ์ด๋ฒ„ %s์„(๋ฅผ) ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค."
 msgid "Method %s did not start correctly"
 msgstr "์„ค์น˜ ๋ฐฉ๋ฒ• %s์ด(๊ฐ€) ์˜ฌ๋ฐ”๋ฅด๊ฒŒ ์‹œ์ž‘ํ•˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "'%2$s' ๋“œ๋ผ์ด๋ธŒ์— '%1$s'(์œผ)๋กœ ํ‘œ๊ธฐ๋œ ๋””์Šคํฌ๋ฅผ ๋„ฃ๊ณ  Enter๋ฅผ ๋ˆ„๋ฅด์‹ญ์‹œ์˜ค."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' ํŒจํ‚ค์ง€ ์‹œ์Šคํ…œ์„ ์ง€์›ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "์˜ฌ๋ฐ”๋ฅธ ํŒจํ‚ค์ง€ ์‹œ์Šคํ…œ ํƒ€์ž…์„ ์•Œ์•„๋‚ผ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
@@ -2893,14 +2936,14 @@ msgstr "์บ์‹œ์˜ ๋ฒ„์ „ ์‹œ์Šคํ…œ์ด ํ˜ธํ™˜๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s ์ฒ˜๋ฆฌ ์ค‘์— ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค (FindPkg)"
@@ -2921,26 +2964,26 @@ msgstr "์šฐ์™€, ์ด APT๊ฐ€ ์ฒ˜๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ์„ค๋ช… ๊ฐœ์ˆ˜๋ฅผ ๋„˜์–ด๊ฐ”์Šต๋‹ˆ
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "์šฐ์™€, ์ด APT๊ฐ€ ์ฒ˜๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ์˜์กด์„ฑ ๊ฐœ์ˆ˜๋ฅผ ๋„˜์–ด๊ฐ”์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ํŒŒ์ผ ์˜์กด์„ฑ์„ ์ฒ˜๋ฆฌํ•˜๋Š” ๋ฐ, %s %s ํŒจํ‚ค์ง€๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "์†Œ์Šค ํŒจํ‚ค์ง€ ๋ชฉ๋ก %s์˜ ์ •๋ณด๋ฅผ ์ฝ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ํŒจํ‚ค์ง€ ๋ชฉ๋ก์„ ์ฝ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ํŒŒ์ผ์—์„œ ์ œ๊ณตํ•˜๋Š” ๊ฒƒ์„ ๋ชจ์œผ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "์†Œ์Šค ์บ์‹œ๋ฅผ ์ €์žฅํ•˜๋Š”๋ฐ ์ž…์ถœ๋ ฅ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
 
@@ -2953,55 +2996,55 @@ msgstr "์ด๋ฆ„ ๋ฐ”๊พธ๊ธฐ๊ฐ€ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค. %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum์ด ๋งž์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "ํ•ด์‹œ ํ•ฉ์ด ๋งž์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release ํŒŒ์ผ %s ํŒŒ์ผ์„ ํŒŒ์‹ฑํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "๋‹ค์Œ ํ‚ค ID์˜ ๊ณต๊ฐœํ‚ค๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "๋ฐฐํฌํŒ ์ถฉ๋Œ: %s (์˜ˆ์ƒ๊ฐ’ %s, ์‹ค์ œ๊ฐ’ %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "๋””์ง€ํ„ธ ์„œ๋ช… ํ™•์ธ์— ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค. ์ €์žฅ๊ณ ๋ฅผ ์—…๋ฐ์ดํŠธํ•˜์ง€ ์•Š๊ณ \n"
 "์˜ˆ์ „์˜ ์ธ๋ฑ์Šค ํŒŒ์ผ์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค. GPG ์˜ค๋ฅ˜: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG ์˜ค๋ฅ˜: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3010,7 +3053,7 @@ msgstr ""
 "%s ํŒจํ‚ค์ง€์˜ ํŒŒ์ผ์„ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ˆ˜๋™์œผ๋กœ ์ด ํŒจํ‚ค์ง€๋ฅผ ๊ณ ์ณ์•ผ ํ•  ์ˆ˜๋„ ์žˆ์Šต"
 "๋‹ˆ๋‹ค. (์•„ํ‚คํ…์ณ๊ฐ€ ๋น ์กŒ๊ธฐ ๋•Œ๋ฌธ์ž…๋‹ˆ๋‹ค)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3019,38 +3062,38 @@ msgstr ""
 "%s ํŒจํ‚ค์ง€์˜ ํŒŒ์ผ์„ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ˆ˜๋™์œผ๋กœ ์ด ํŒจํ‚ค์ง€๋ฅผ ๊ณ ์ณ์•ผ ํ•  ์ˆ˜๋„ ์žˆ์Šต"
 "๋‹ˆ๋‹ค."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ํŒจํ‚ค์ง€ ์ธ๋ฑ์Šค ํŒŒ์ผ์ด ์†์ƒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค. %s ํŒจํ‚ค์ง€์— Filename: ํ•„๋“œ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ํฌ๊ธฐ๊ฐ€ ๋งž์ง€ ์•Š์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release ํŒŒ์ผ %s ํŒŒ์ผ์„ ํŒŒ์‹ฑํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Release ํŒŒ์ผ %s์— ์„น์…˜์ด ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Release ํŒŒ์ผ %s์— Hash ํ•ญ๋ชฉ์ด ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Release ํŒŒ์ผ %s์— 'Valid-Until' ํ•ญ๋ชฉ์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Release ํŒŒ์ผ %s์— 'Date' ํ•ญ๋ชฉ์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค"
@@ -3078,7 +3121,7 @@ msgstr "์•Œ์•„๋ณด๋Š” ์ค‘์ž…๋‹ˆ๋‹ค.. "
 msgid "Stored label: %s\n"
 msgstr "์ €์žฅ๋œ ๋ ˆ์ด๋ธ”: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM์„ ๋งˆ์šดํŠธ ํ•ด์ œํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค...\n"
 
@@ -3140,30 +3183,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ํŒจํ‚ค์ง€ ๋ชฉ๋ก์„ ๋ณต์‚ฌํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "์ƒˆ ์†Œ์Šค ๋ฆฌ์ŠคํŠธ๋ฅผ ์“ฐ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "์ด ๋””์Šคํฌ์˜ ์†Œ์Šค ๋ฆฌ์ŠคํŠธ ํ•ญ๋ชฉ์€ ๋‹ค์Œ๊ณผ ๊ฐ™์Šต๋‹ˆ๋‹ค:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "๋ ˆ์ฝ”๋“œ %i๊ฐœ๋ฅผ ์ผ์Šต๋‹ˆ๋‹ค.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "๋ ˆ์ฝ”๋“œ %i๊ฐœ๋ฅผ ํŒŒ์ผ %i๊ฐœ๊ฐ€ ๋น ์ง„ ์ƒํƒœ๋กœ ์ผ์Šต๋‹ˆ๋‹ค.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "๋ ˆ์ฝ”๋“œ %i๊ฐœ๋ฅผ ํŒŒ์ผ %i๊ฐœ๊ฐ€ ๋งž์ง€ ์•Š์€ ์ƒํƒœ๋กœ ์ผ์Šต๋‹ˆ๋‹ค\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "๋ ˆ์ฝ”๋“œ %i๊ฐœ๋ฅผ ํŒŒ์ผ %i๊ฐœ๊ฐ€ ๋น ์ง€๊ณ  %i๊ฐœ๊ฐ€ ๋งž์ง€ ์•Š์€ ์ƒํƒœ๋กœ ์ผ์Šต๋‹ˆ๋‹ค\n"
@@ -3178,17 +3221,6 @@ msgstr "๋‹ค์Œ์˜ ์ธ์ฆ ๊ธฐ๋ก์„ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: %s"
 msgid "Hash mismatch for: %s"
 msgstr "๋‹ค์Œ์˜ ํ•ด์‹œ๊ฐ€ ๋‹ค๋ฆ…๋‹ˆ๋‹ค: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s์— ํ‚ค ๋ชจ์Œ์„ ์„ค์น˜ํ•˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3254,114 +3286,114 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s ์„ค์น˜ํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s ์„ค์ • ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์ง€์šฐ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์™„์ „ํžˆ ์ง€์šฐ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s ์‚ฌ๋ผ์ง ๋ฐœ๊ฒฌํ–ˆ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "์„ค์น˜ ํ›„ ํŠธ๋ฆฌ๊ฑฐ %s ์‹คํ–‰ํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "๋””๋ ‰ํ„ฐ๋ฆฌ '%s' ์—†์Šต๋‹ˆ๋‹ค."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "'%s' ํŒŒ์ผ์„ ์—ด ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s ์ค€๋น„ ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s ํ‘ธ๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์„ค์ •ํ•  ์ค€๋น„ํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s ์„ค์น˜"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์ง€์šธ ์ค€๋น„ํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s ์ง€์›€"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์™„์ „ํžˆ ์ง€์šธ ์ค€๋น„๋ฅผ ํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s ํŒจํ‚ค์ง€๋ฅผ ์™„์ „ํžˆ ์ง€์› ์Šต๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "๋กœ๊ทธ์— ์“ฐ๋Š”๋ฐ ์‹คํŒจ. openpty() ์‹คํŒจ(/dev/pts๊ฐ€ ๋งˆ์šดํŠธ๋˜์–ด์žˆ์ง€ ์•Š์Šต๋‹ˆ๊นŒ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "dpkg ์‹คํ–‰ํ•˜๋Š” ์ค‘์ž…๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "๋ณด๊ณ ์„œ๋ฅผ ์ž‘์„ฑํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ์ด๋ฏธ MaxReports ๊ฐ’์— ๋„๋‹ฌํ–ˆ์Šต๋‹ˆ๋‹ค."
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "์˜์กด์„ฑ ๋ฌธ์ œ - ์„ค์ •ํ•˜์ง€ ์•Š์€ ์ƒํƒœ๋กœ ๋‚จ๊ฒจ๋‘ก๋‹ˆ๋‹ค"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3369,7 +3401,7 @@ msgstr ""
 "๋ณด๊ณ ์„œ๋ฅผ ์ž‘์„ฑํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ์˜ค๋ฅ˜ ๋ฉ”์‹œ์ง€์— ๋”ฐ๋ฅด๋ฉด ์˜ˆ์ „์˜ ์‹คํŒจ ๋•Œ๋ฌธ์— ์ƒ๊ธด ๋ถ€์ˆ˜"
 "์ ์ธ ์˜ค๋ฅ˜์ž…๋‹ˆ๋‹ค."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3382,13 +3414,7 @@ msgid ""
 "error"
 msgstr "๋ณด๊ณ ์„œ๋ฅผ ์ž‘์„ฑํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ์˜ค๋ฅ˜ ๋ฉ”์‹œ์ง€์— ๋”ฐ๋ฅด๋ฉด ๋ฉ”๋ชจ๋ฆฌ๊ฐ€ ๋ถ€์กฑํ•ฉ๋‹ˆ๋‹ค."
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3421,22 +3447,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "์ž ๊ธฐ์ง€ ์•Š์Œ"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr ""
-#~ "'%s:%s'์˜ ์ฃผ์†Œ๋ฅผ ์•Œ์•„๋‚ด๋Š”๋ฐ ๋ฌด์–ธ๊ฐ€ ์ด์ƒํ•œ ์ผ์ด ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ์™„๋ฃŒ"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "๋””์ง€ํ„ธ ์„œ๋ช… ํ™•์ธ์— ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค. ์ €์žฅ๊ณ ๋ฅผ ์—…๋ฐ์ดํŠธํ•˜์ง€ ์•Š๊ณ \n"
-#~ "์˜ˆ์ „์˜ ์ธ๋ฑ์Šค ํŒŒ์ผ์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค. GPG ์˜ค๋ฅ˜: %s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "%s ํŒŒ์ผ์€ ์—†์œผ๋ฏ€๋กœ ๋ฌด์‹œํ•ฉ๋‹ˆ๋‹ค"
 
diff --git a/po/ku.po b/po/ku.po
index 69e7c677d..73b08a30e 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -100,73 +100,73 @@ msgstr "Cihรช giลŸtรฎ yรช veqetandรฎ: "
 msgid "Package file %s is out of sync."
 msgstr "Pakรชta dosya %s li derveyรฎ demรช ye."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Pakรชt nayรชn dรฎtin"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Pรชwist e tu mรฎnakekรช bidรฎ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakรชt nehate dรฎtin %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pelgehรชn Pakรชt:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nehate dรฎtin)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Sazkirรฎ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ne tiลŸtek)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Destika pakรชtรช:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ji bo %s %s komkirรฎ di %s %s de\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,21 +203,29 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Ji kerema xwe re navekรฎ li vรฎ Dรฎsketรฎ bike, wekรฎ 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Dรฎsketรช siwar bike รป piลŸtre biลŸkoja derbaskirinรช bitikรฎne"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Anรฎna %s %s biserneket\n"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -446,7 +454,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "%s jixwe guhertoya nรปtirรฎn e.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lรช %s dรช were sazkirin"
@@ -553,8 +561,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarรฎ cihรช vala li %s tesbรฎt bike"
@@ -590,7 +598,7 @@ msgstr "Betal."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Dixwazรฎ bidomรฎnรฎ [E/n]?"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Anรฎna %s %s biserneket\n"
@@ -599,7 +607,7 @@ msgstr "Anรฎna %s %s biserneket\n"
 msgid "Some files failed to download"
 msgstr "Daxistina รงend pelan biserneket"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -675,7 +683,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
@@ -721,7 +729,7 @@ msgid ""
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -729,85 +737,85 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Paketรชn ลŸikestรฎ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Paketรชn tรชn pรชลŸniyaz kirin:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Paketรชn tรชn tawsiyรช kirin:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarรฎ pakรชta %s bibรฎne"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "lรช %s dรช were sazkirin"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tรช hesibandin..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Serneket"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Temam"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Pelrรชรงa daxistinรช nayรช quflekirin"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -815,141 +823,141 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Cihรช vala li %s tรชre nake"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ร‡avkanรฎna %s bรฎne\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Anรฎna รงend arลŸรฎvan biserneket."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Girรชdan bi %s (%s) re pรชk tรช"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -995,7 +1003,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1063,7 +1071,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s jixwe guhertoya nรปtirรฎn e.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -1198,8 +1207,8 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "ร‡ewiya xwendinรช"
 
@@ -1212,8 +1221,8 @@ msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ร‡ewtiya nivรฎsรฎnรช"
 
@@ -1267,7 +1276,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1295,86 +1304,99 @@ msgstr "Lรชpirsรฎn"
 msgid "Unable to invoke "
 msgstr "%s venebรป"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Girรชdan bi %s (%s) re pรชk tรช"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bi %s re tรช girรชdan"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nikarรฎ '%s' รงareser bike"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, c-format
+msgid "System error resolving '%s:%s'"
+msgstr ""
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nikare bi %s re girรชdan pรชk bรฎne %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de รงewtiya nenas"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakรชtรชn Nร› dรช werine sazkirin:"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1412,54 +1434,54 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Hilbijartin neserketรฎ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokรช joreagahรฎ dihate nivรฎsรฎn รงewtรฎ"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Dema li pelรฎ dihate nivรฎsรฎn รงewtรฎ"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Dema li pelรฎ dihate nivรฎsรฎn รงewtรฎ"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Girรชdan pรชk nehatiye"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ร‡ewtiya hundirรฎn"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwรฎne"
@@ -1486,7 +1508,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "Nikarรฎ pelรช %s veke"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nikarรฎ pelรช %s veke"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1566,7 +1593,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nivรฎsandin ji bo %s ne pรชkane"
@@ -1671,8 +1698,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Danegira %s nehate vekirin: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
@@ -1685,87 +1712,87 @@ msgstr "Tomara kontrola arลŸรฎvรช tuneye"
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: pelrรชรงa %s nayรช xwendin\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s ji hev nehate veรงirandin"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s venebรป"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Di arลŸรฎvรช de qada pakรชtรช tuneye"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -1839,7 +1866,7 @@ msgstr ""
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr ""
@@ -1889,24 +1916,24 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 #, fuzzy
 msgid "Failed to create pipes"
 msgstr "%s ji hev nehate veรงirandin"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Xebitandina gzip biserneket"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
@@ -1978,55 +2005,55 @@ msgstr "Nivรฎsรฎna pelรช %s biserneket"
 msgid "Failed to close file %s"
 msgstr "Girtina pelรช %s biserneket"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Rรชรงa %s zรชde dirรชj e"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 #, fuzzy
 msgid "The diversion path is too long"
 msgstr "Lรฎsteya dirรชjahiya รงavkaniyรช zรชde dirรชj e"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Rรชรง zรชde dirรชj e"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, fuzzy, c-format
 msgid "Unable to stat %s"
 msgstr "Nivรฎsandin ji bo %s ne pรชkane"
@@ -2105,30 +2132,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Hilbijartina %s nehatiye dรฎtin"
@@ -2198,6 +2225,16 @@ msgstr "%c%s... ร‡ewtรฎ!"
 msgid "%c%s... Done"
 msgstr "%c%s... ร‡รชbรป"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ร‡รชbรป"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2258,114 +2295,120 @@ msgstr ""
 msgid "Problem closing the gzip file %s"
 msgstr "Di girtina pelรฎ de pirsgirรชkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nikarรฎ qufila pelรช %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nikarรฎ pelรช %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nikarรฎ pelรช %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Di girtina pelรฎ de pirsgirรชkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Di girtina pelรฎ de pirsgirรชkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Di girtina pelรฎ de pirsgirรชkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr ""
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tรช betalkirin."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
@@ -2391,59 +2434,59 @@ msgstr ""
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Bindest"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "PรชลŸBindest"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "PรชลŸniyaz dike"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Tawsiye dike"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Nakokรฎ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Dikeve ลŸunve"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Kevin dike"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "DiลŸkรฎne"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "girรฎng"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "pรชwist"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opsiyonel"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ekstra"
 
@@ -2543,29 +2586,29 @@ msgstr "%s tรช vekirin"
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nikarรฎ pelรช %s veke"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2584,23 +2627,23 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Peldanka '%s' kรชm e"
@@ -2637,17 +2680,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Dรฎsketรช siwar bike รป piลŸtre biลŸkoja derbaskirinรช bitikรฎne"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2700,14 +2743,14 @@ msgstr ""
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Dema ลŸixulandina naveroka %s รงewtรฎ"
@@ -2728,26 +2771,26 @@ msgstr ""
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lรฎsteya pakรชtan tรช xwendin"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2760,97 +2803,97 @@ msgstr "nav guherandin biserneket, %s (%s -> %s)"
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum li hev nayรชn"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum li hev nayรชn"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Pakรชt nehate dรฎtin %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Mezinahรฎ li hev nayรชn"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Pakรชt nehate dรฎtin %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Pakรชt nehate dรฎtin %s"
@@ -2876,7 +2919,7 @@ msgstr ""
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
@@ -2936,30 +2979,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Lรฎsteyรชn pakรชtan tรชn jibergirtin..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i tomar hatin nivรฎsรฎn.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -2974,17 +3017,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum li hev nayรชn"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tรช betalkirin."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3048,119 +3080,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s tรช mรฎhengkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s tรช rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s bi tevahรฎ hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kรชm e"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nikarรฎ pelรช %s veke"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s tรช amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s tรช derxistin"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Mรฎhengkirina %s tรช amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Rakirina %s tรช amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Bi tevahรฎ rakirina %s tรช amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s bi tevahรฎ hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3172,13 +3204,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3207,10 +3233,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ร‡รชbรป"
-
 #~ msgid "Failed to remove %s"
 #~ msgstr "Rakirina %s biserneket"
 
diff --git a/po/lt.po b/po/lt.po
index 0653dd06c..a7ed0d578 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -99,72 +99,72 @@ msgstr ""
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Paketลณ nerasta"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Paketลณ failai:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Suriลกti paketai:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nerasta)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ฤฎdiegta: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(nฤ—ra)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versijลณ lentelฤ—:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,20 +201,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Praลกome ฤฏdฤ—ti diskฤ… ฤฏ ฤฏrenginฤฏ ir paspausti Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nepavyko pervadinti %s ฤฏ %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Pakartokite ลกitฤ… procesฤ… su kitais CD savo rinkinyje."
 
@@ -450,7 +458,7 @@ msgstr "Pakartotinas %s ฤฏdiegimas neฤฏmanomas, jo nepavyksta parsiลณsti.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nustatytas kaip ฤฏdiegtas rankiniu bลซdu\n"
@@ -558,8 +566,8 @@ msgstr "Po ลกios operacijos bus naudojama %sB papildomos disko vietos.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po ลกios operacijos bus atlaisvinta %sB disko vietos.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nepavyko nustatyti %s laisvos vietos"
@@ -598,7 +606,7 @@ msgstr "Nutraukti."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ar norite tฤ™sti [T/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nepavyko parsiลณsti %s  %s\n"
@@ -607,7 +615,7 @@ msgstr "Nepavyko parsiลณsti %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiลณsti kai kuriลณ failลณ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Pavyko parsiลณsti tik parsiuntimo reลพime"
 
@@ -685,7 +693,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ล i informacija gali padฤ—ti iลกsprฤ™sti ลกiฤ… situacijฤ…:"
 
@@ -734,7 +742,7 @@ msgstr ""
 "Nepatenkintos priklausomybฤ—s. Pabandykite ฤฏvykdyti 'apt-get -f install' be "
 "nurodytลณ paketลณ (arba nurodykite iลกeitฤฏ)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -746,85 +754,85 @@ msgstr ""
 "leidimฤ…, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
 "paลกalinti iลก \"Incoming\" aplanko."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Bus ฤฏdiegti ลกie papildomi paketai:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Siลซlomi paketai:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Rekomenduojami paketai:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s nustatytas kaip ฤฏdiegtas rankiniu bลซdu\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Skaiฤiuojami atnaujinimai... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ฤฎvykdyta"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vidinฤ— klaida, problemos sprendimas kaลพkฤ… sugadino"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Nepavyko uลพrakinti parsiuntimลณ aplanko"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Bลซtina nurodyti bent vienฤ… paketฤ…, kad parsiลณsti jo iลกeities tekstฤ…"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nepavyko surasti iลกeities teksto paketo, skirto %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -832,85 +840,85 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidลพiama jau parsiลณsta byla โ€ž%sโ€œ\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Neturite pakankamai laisvos vietos %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Reikia parsiลณsti %sB/%sB iลกeities archyvลณ.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Reikia parsiลณsti %sB iลกeities archyvลณ.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Parsiunฤiamas archyvas %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kuriลณ arhcyvลณ."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Jau iลกpakuotas archyvas %s praleidลพiama\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Nepavyko ฤฏvykdyti iลกpakavimo komandos โ€ž%sโ€œ\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Patikrinkite, ar ฤฏdiegtas โ€ždpkg-devโ€œ paketas.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Nepavyko ฤฏvykdyti paketo kompiliavimo komandos โ€ž%sโ€œ\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Bลซtina nurodyti bent vienฤ… paketฤ…, kuriam norite ฤฏvykdyti builddeps"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nepavyko gauti kลซrimo-priklausomybiลณ informacijos paketui %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -918,7 +926,7 @@ msgid ""
 msgstr ""
 "%s priklausomybฤ— %s paketui negali bลซti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -926,14 +934,14 @@ msgid ""
 msgstr ""
 "%s priklausomybฤ— %s paketui negali bลซti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nepavyko patenkinti %s priklausomybฤ—s %s paketui: ฤฎdiegtas paketas %s yra "
 "per naujas"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -942,7 +950,7 @@ msgstr ""
 "%s priklausomybฤ— %s paketui negali bลซti patenkinama, nes nฤ—ra tinkamos "
 "versijos %s paketo"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -950,30 +958,30 @@ msgid ""
 msgstr ""
 "%s priklausomybฤ— %s paketui negali bลซti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nepavyko patenkinti %s priklausomybฤ—s %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1019,7 +1027,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1090,7 +1098,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -1224,8 +1233,8 @@ msgstr "Jungiamasi per ilgai"
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
@@ -1238,8 +1247,8 @@ msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Raลกymo klaida"
 
@@ -1293,7 +1302,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1320,85 +1329,98 @@ msgstr "Uลพklausti"
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai uลพtruko"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nepavyko prisijungti prie %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nepavyko surasti vardo โ€ž%sโ€œ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Laikinas sutrikimas ieลกkant vardo โ€ž%sโ€œ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Laikinas sutrikimas ieลกkant vardo โ€ž%sโ€œ"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nepavyko prisijungti prie %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Neลพinoma klaida kvieฤiant gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ล ie paraลกai buvo nevalidลซs:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1436,53 +1458,53 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigฤ—si"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Klaida bandant raลกyti ฤฏ failฤ…"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Vidinฤ— klaida"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
@@ -1509,7 +1531,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "Nepavyko atverti failo %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nepavyko atverti failo %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1606,7 +1633,7 @@ msgstr ""
 "  -c=? Nuskaityti ลกฤฏ konfigลซracijลณ failฤ…\n"
 "  -o=? Nustatyti savarankiลกkas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nepavyko ฤฏraลกyti ฤฏ %s"
@@ -1758,8 +1785,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nepavyko patikrinti %s"
@@ -1772,87 +1799,87 @@ msgstr ""
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "ฤฎ: Nepavyko perskaityti aplanko %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "ฤฎ: Nepavyko patikrinti %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "K: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "ฤฎ: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "K: Klaidos failui "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nepavyko iลกsprฤ™sti %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Judesys medyje nepavyko"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nepavyko atverti %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nepavyko nuskaityti nuorodos %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nepavyko atsieti nuorodos %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nepavyko susieti %s su %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archyvas neturฤ—jo paketo lauko"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s neturi perraลกymo ฤฏraลกo\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s priลพiลซrฤ—tojas yra %s, o ne %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -1926,7 +1953,7 @@ msgstr "Skaitymo klaida skaiฤiuojant MD5"
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nepavyko pervadinti %s ฤฏ %s"
@@ -1986,23 +2013,23 @@ msgstr ""
 "  -c=? Nuskaityti ลกiฤ… konfigลซracijos bylฤ…\n"
 "  -o=? Nurodyti savarankiลกkas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Sugadintas archyvas"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar kontrolinฤ— suma klaidinga, archyvas sugadintas"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neลพinomas TAR antraลกtฤ—s tipas %u. narys %s"
@@ -2073,54 +2100,54 @@ msgstr ""
 msgid "Failed to close file %s"
 msgstr ""
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Kelias %s per ilgas"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Kelias per ilgas"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
@@ -2199,30 +2226,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -2292,6 +2319,16 @@ msgstr "%c%s... Klaida!"
 msgid "%c%s... Done"
 msgstr "%c%s... Baigta"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Baigta"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2352,114 +2389,120 @@ msgstr ""
 msgid "Problem closing the gzip file %s"
 msgstr "Klaida uลพveriant failฤ…"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nepavyko atverti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nepavyko rezervuoti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Procesas %s gavo segmentavimo klaidฤ…"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Procesas %s gavo segmentavimo klaidฤ…"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Procesas %s grฤ…ลพino klaidos kodฤ… (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Procesas %s netikฤ—tai iลกฤ—jo"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Nepavyko sukurti subproceso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Nepavyko paleisti suspaudฤ—jo "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Klaida uลพveriant failฤ…"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Klaida sinchronizuojant failฤ…"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Klaida uลพveriant failฤ…"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Klaida sinchronizuojant failฤ…"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
@@ -2485,59 +2528,59 @@ msgstr ""
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Priklauso"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Prieลกpriklauso"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Siลซlo"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Rekomenduoja"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Konfliktuoja"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Pakeiฤia"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Pakeiฤia"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Sugadina"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "Svarbu"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "privaloma"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standartinis"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "nebลซtinas"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "papildomas"
 
@@ -2637,29 +2680,29 @@ msgstr "Atveriama %s"
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2678,17 +2721,17 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2697,7 +2740,7 @@ msgstr ""
 "Kai kuriลณ indeksลณ failลณ nepavyko parsiลณsti, jie buvo ignoruoti arba vietoje "
 "jลณ panaudoti seni."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Trลซksta aplanko โ€ž%sโ€œ"
@@ -2734,17 +2777,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ฤฎdฤ—kite diskฤ… โ€ž%sโ€œ ฤฏ ฤฏrenginฤฏ โ€ž%sโ€œ ir paspauskite Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2799,14 +2842,14 @@ msgstr ""
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Klaida apdorojant turinฤฏ %s"
@@ -2827,26 +2870,26 @@ msgstr ""
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Skaitomi paketลณ sฤ…raลกai"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2859,97 +2902,97 @@ msgstr ""
 msgid "MD5Sum mismatch"
 msgstr "MD5 sumos neatitikimas"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Maiลกos sumos nesutapimas"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG klaida: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Neatitinka dydลพiai"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Pastaba: paลพymimas %s vietoje %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Pastaba: paลพymimas %s vietoje %s\n"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
@@ -2975,7 +3018,7 @@ msgstr "Identifikuojama.. "
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Atjungiamas CD-ROM...\n"
 
@@ -3035,30 +3078,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopijuojami paketลณ sฤ…raลกai..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Raลกomas naujas ลกaltiniลณ sฤ…raลกas\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3073,17 +3116,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Maiลกos sumos nesutapimas"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3147,119 +3179,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "ฤฎdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigลซruojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ล alinamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Visiลกkai paลกalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Trลซksta aplanko โ€ž%sโ€œ"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Ruoลกiamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Iลกpakuojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Ruoลกiamasi konfigลซruoti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ฤฎdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Ruoลกiamasi %s paลกalinimui"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Paลกalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Ruoลกiamasi visiลกkai paลกalinti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Visiลกkai paลกalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3271,13 +3303,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3307,14 +3333,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Laikinas sutrikimas ieลกkant vardo โ€ž%sโ€œ"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Baigta"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Praleidลพiama jau parsiลณsta byla โ€ž%sโ€œ\n"
 
diff --git a/po/makefile b/po/makefile
index ebf6c06d0..5a3c7fb67 100644
--- a/po/makefile
+++ b/po/makefile
@@ -30,17 +30,23 @@ GETDOMAIN = $(word 1,$(subst /, ,$(1)))
 # and produce the .pot file.
 $(POTFILES) : $(PO)/%.pot :
 	echo "Generating POT file $@"
-	echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
+	echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d.tmp
+	cmp --silent $@.d.tmp $@.d || mv $@.d.tmp $@.d
 # From sh source
-	cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot
+	cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot.tmp
+	cmp --silent $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot || \
+		mv $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot
 # From C/C++ source
 	cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in
 	$(XGETTEXT) --default-domain=$* --directory=$(BASE) \
 	  --add-comments --foreign --keyword=_ --keyword=N_ \
 	  --keyword=P_:1,2 \
-	  --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
+	  --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp
+	cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \
+		mv $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot
 	rm -f $(PO)/POTFILES_$*.in
-	$(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
+	$(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@.tmp
+	cmp --silent $@ $@.tmp || mv $@.tmp $@
 	# copy into the domain dirs to make rosetta happy
 	rm -f $(PO)/domains/$*/*.pot
 	cp $@ $(PO)/domains/$*
@@ -93,4 +99,5 @@ ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)
 endif
 
+# otherwise the output is completely screwed
 .NOTPARALLEL:
diff --git a/po/mr.po b/po/mr.po
index f2910412e..ae9fd15fa 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -95,73 +95,73 @@ msgstr "เคนเคฟเคถเฅ‡เคฌเคพเคค เค˜เฅ‡เคคเคฒเฅ‡เคฒเฅ€ เคเค•เฅ‚เคฃ เค…เคตเค•เคพเคถ
 msgid "Package file %s is out of sync."
 msgstr "เคชเฅ…เค•เฅ‡เคœ เคธเค‚เคšเคฟเค•เคพ %s เคธเคฟเค‚เค•เฅเคฐเฅ‹เคจเคพเค‡เคœ เคจเคพเคนเฅ€เคค"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ เคธเคพเคชเคกเคฒเฅ‡ เคจเคพเคนเฅ€เคค"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "เคคเฅเคฎเฅเคนเคพเคฒเคพ เคซเค•เฅเคค เคเค•เคš เคจเคฎเฅเคจเคพ เคฆเฅเคฏเคพเคตเคพ เคฒเคพเค—เฅ‡เคฒ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "เคชเฅ…เค•เฅ‡เคœ %s เคถเฅ‹เคงเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ เค†เคนเฅ‡"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "เคชเฅ…เค•เฅ‡เคœ เคธเค‚เคšเคฟเค•เคพ:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "เคฆเฅƒเคคเคฟเค•เคพ เคธเคฟเค‚เค• เคจเคพเคนเฅ€,เคชเฅ…เค•เฅ‡เคœ เคธเค‚เคšเคฟเค•เคพ เค•เฅเคท-เคธเค‚เคฆเคฐเฅเคญ เค•เคฐเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "เคเค•เคคเฅเคฐเคฟเคค เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(เคฎเคฟเคณเคพเคฒเฅ‡ เคจเคพเคนเฅ€)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "เค…เคงเคฟเคทเฅเค เคพเคชเคฟเคค เค•เฅ‡เคฒเฅ‡:"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "เค‰เคฎเฅ‡เคฆเคตเคพเคฐ:"
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(เค•เฅ‹เคฃเคคเคพเคš เคจเคพเคนเฅ€)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "เคชเฅ…เค•เฅ‡เคœ (เคชเคฟเคจ):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "เค†เคตเฅƒเคคเฅเคคเฅ€ เค•เฅ‹เคทเฅเคŸเค•:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s เคนเฅ‡ %s เค•เคฐเคฟเคคเคพ %s %s เคตเคฐ เคธเค‚เค—เฅเคฐเคนเคฟเคค\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,21 +234,29 @@ msgstr ""
 "-o=? เคเค–เคพเคฆเคพ เค…เคนเฅ‡เคคเฅ‚เค• เคธเค‚เคฐเคšเคจเคพ เคชเคฐเฅเคฏเคพเคฏ เคจเคฟเคฐเฅเคงเคพเคฐเคฟเคค เค•เคฐเคพ เค‰เคฆเคพ --o dir::cache=/tmp\n"
 "เค…เคงเคฟเค• เคฎเคพเคนเคฟเคคเฅ€เคธเคพเค เฅ€ apt-cache(8) and apt.conf(5) เคšเฅ€ เคฎเฅ…เคจเฅเคฏเฅเค…เคฒ เคชเฅƒเคทเฅเค เฅ‡ เคชเคนเคพ \n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "เคฏเคพ เคคเคฌเค•เคกเฅ€เคฒเคพ เค•เฅƒเคชเคฏเคพ เคจเคพเคต เคฆเฅเคฏเคพ เคœเคธเฅ‡ เคกเฅ‡เคฌเคฟเคฏเคจ เฅจ เคเคฒเค†เคฐเคเคฒ เคคเคฌเค•เคกเฅ€ เฅง"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "เค•เฅƒเคชเคฏเคพ เคคเคฌเค•เคกเฅ€ เคกเฅเคฐเคพเคˆเคตเฅเคนเคฎเคงเฅเคฏเฅ‡ เค เฅ‡เคตเฅ‚เคจ เคเค‚เคŸเคฐ เคฆเคพเคฌเคพ"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s เคฒเคพ เคชเฅเคจเคฐเฅเคจเคพเคฎเคพเค‚เค•เคจ %s เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ "
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "เคคเฅเคฎเคšเฅเคฏเคพ เคธเค‚เคšเคพเคฎเคงเฅ€เคฒ เคธเคฐเฅเคต เคธเฅ€เคกเฅ€เคœเคธเคพเค เฅ€ เคฏเคพเคš เค•เฅƒเคคเฅ€เคšเฅ€ เคชเฅเคจเคฐเคพเคตเฅƒเคคเฅเคคเฅ€ เค•เคฐเคพ(เคนเฅ€เคš เค•เฅƒเคคเฅ€ เค•เคฐเคพ)"
 
@@ -482,7 +490,7 @@ msgstr "%s เคšเฅ‡ เคชเฅเคจเคฐเฅเคธเค‚เคธเฅเคฅเคพเคชเคจ เคถเค•เฅเคฏ เคจเคพเคน
 msgid "%s is already the newest version.\n"
 msgstr "%s เคนเฅ€ เค†เคงเฅ€เคš เคจเคตเคฟเคจ เค†เคตเฅƒเคคเฅเคคเฅ€ เค†เคนเฅ‡.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  เคธเฅเคตเคนเคธเฅเคคเฅ‡ เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เค•เคฐเคพเคฏเคšเฅ‡ เค†เคนเฅ‡.\n"
@@ -589,8 +597,8 @@ msgstr "เคฏเคพ เค•เฅเคฐเคฟเคฏเฅ‡เคจเค‚เคคเคฐ, %sB เคเคตเคขเฅ€ เค…เคงเคฟเค• เคก
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "เคฏเคพ เค•เฅเคฐเคฟเคฏเฅ‡เคจเค‚เคคเคฐ, %sB เคกเคฟเคธเฅเค• เคœเคพเค—เคพ เคฎเฅ‹เค•เคณเฅ€ เคนเฅ‹เคˆเคฒ.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s เคฎเคงเฅเคฏเฅ‡ เคฐเคฟเค•เคพเคฎเฅ€ เคœเคพเค—เคพ เคธเคพเค‚เค—เฅ‚ เคถเค•เคค เคจเคพเคนเฅ€"
@@ -629,7 +637,7 @@ msgstr "เคตเฅเคฏเคคเฅเคฏเคฏ/เคฌเค‚เคฆ เค•เคฐเคพ."
 msgid "Do you want to continue [Y/n]? "
 msgstr "เคคเฅเคฎเฅเคนเคพเคฒเคพ เคชเฅเคขเฅ‡ เคœเคพเคฏเคšเฅ‡ เค†เคนเฅ‡ [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s เค†เคฃเคฃเฅ‡ เค…เคธเคซเคฒ\n"
@@ -638,7 +646,7 @@ msgstr "%s  %s เค†เคฃเคฃเฅ‡ เค…เคธเคซเคฒ\n"
 msgid "Some files failed to download"
 msgstr "เค•เคพเคนเฅ€ เคธเค‚เคšเคฟเค•เคพ เคกเคพเคŠเคจเคฒเฅ‹เคก เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "เคกเคพเคŠเคจเคฒเฅ‹เคก เคธเค‚เคชเฅ‚เคฐเฅเคฃ เค†เคฃเคฟ เคกเคพเคŠเคจเคฒเฅ‹เคก เคฎเคงเฅเคฏเฅ‡ เคซเค•เฅเคค เคชเคฆเฅเคงเคคเฅ€"
 
@@ -719,7 +727,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "เค–เคพเคฒเฅ€เคฒ เคฎเคพเคนเคฟเคคเฅ€ เคชเคฐเคฟเคธเฅเคฅเคฟเคคเฅ€ เคจเคฟเคตเคณเคฃเฅเคฏเคพเคธเคพเค เฅ€ เคฎเคฆเคค เค เคฐเฅ‚ เคถเค•เฅ‡เคฒ:"
 
@@ -770,7 +778,7 @@ msgstr ""
 "เค…เคจเคฎเฅ‡เคŸ เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€เคœ.เคเคชเฅ€เคŸเฅ€-เค—เฅ‡เคŸ -เคเคซ เคธเค‚เคธเฅเคฅเคพเคชเคจ ('apt-get -f install') เคชเฅ…เค•เฅ‡เคœเคถเคฟเคตเคพเคฏ เคชเฅเคฐเคฏเคคเฅเคจ เค•เคฐเคพ "
 "(เค•เคฟเค‚เคตเคพ เคชเคฐเฅเคฏเคพเคฏ เคธเคพเค‚เค—เคพ)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -782,85 +790,85 @@ msgstr ""
 "เคตเคฟเคญเคพเค—เคฃเฅ€ เค…เคธเคฃเคพเคฐเฅ€ เคชเคฃ เคนเคตเฅ€ เค…เคธเคฃเคพเคฐเฅ€, เคคเคฏเคพเคฐ เค•เฅ‡เคฒเฅ€ เคจเคธเคฒเฅ‡เคฒเฅ€ เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ เคตเคพเคชเคฐเคค เค…เคธเคพเคฒ \n"
 "เค•เคฟเค‚เคตเคพ เคคเฅ€ เคฏเฅ‡เคฃเคพเคฑเฅเคฏเคพเค‚เคชเฅˆเค•เฅ€ เคฌเคพเคนเฅ‡เคฐ เคนเคฒเคตเคฟเคฒเฅ€ เค…เคธเคคเฅ€เคฒ."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "เคคเฅเคŸเคฒเฅ‡เคฒเฅ€ เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "เค–เคพเคฒเฅ€เคฒ เค…เคคเคฟเคฐเคฟเค•เฅเคค เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เคนเฅ‹เคคเฅ€เคฒ:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "เคธเฅเคšเคตเคฒเฅ‡เคฒเฅ€ เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "เคถเคฟเคซเคพเคฐเคธ เค•เฅ‡เคฒเฅ‡เคฒเฅ€ เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s เคชเฅ…เค•เฅ‡เคœ เคธเคพเคชเคกเฅ‚ เคถเค•เคฒเฅ‡ เคจเคพเคนเฅ€"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s  เคธเฅเคตเคนเคธเฅเคคเฅ‡ เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เค•เคฐเคพเคฏเคšเฅ‡ เค†เคนเฅ‡.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "เคชเฅเคขเคฟเคฒ เค†เคตเฅƒเคคเฅเคคเฅ€เคšเฅ€ เค—เคฃเคคเฅ€ เค•เคฐเฅ€เคค เค†เคนเฅ‡..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "เค…เคธเคฎเคฐเฅเคฅ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "เคเคพเคฒเฅ‡"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เค…เค‚เคคเคฐเฅเค—เคค เคคเฅเคฐเฅเคŸเฅ€, เค…เคกเคšเคฃ เคจเคฟเคตเคพเคฐเค•เคพเคจเฅ‡ เคธเฅเคŸเคซเคฒเคพ เคคเฅ‹เคกเคฒเฅ‡"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "เคกเคพเคŠเคจเคฒเฅ‹เคก เคกเคฟเคฐเฅ‡เค•เฅเคŸเคฐเฅ€ เค•เฅเคฒเฅ‚เคชเคฌเค‚เคฆ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "เค‰เค—เคฎ เคถเฅ‹เคงเคฃเฅเคฏเคพเคธเคพเค เฅ€ เค•เคฟเคฎเคพเคจ เคเค• เคชเฅ…เค•เฅ‡เคœ เคฆเฅ‡เคฃเฅ‡/เคธเคพเค‚เค—เคฃเฅ‡ เค—เคฐเคœเฅ‡เคšเฅ‡ เค†เคนเฅ‡"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s เค‰เค—เคฎ เคชเฅ…เค•เฅ‡เคœ เคถเฅ‹เคงเคฃเฅ‡ เคถเค•เฅเคฏ เคจเคพเคนเฅ€/เคถเฅ‹เคงเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ เค†เคนเฅ‡"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -868,104 +876,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "เค†เคงเฅ€เคš เคกเคพเคŠเคจเคฒเฅ‹เคก เค•เฅ‡เคฒเฅ‡เคฒเฅ€ '%s' เคซเคพเคˆเคฒ เคธเฅ‹เคกเฅ‚เคจ เคฆเฅเคฏเคพ\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s เคฎเคงเฅเคฏเฅ‡ เคชเฅเคฐเฅ‡เคถเฅ€ เคœเคพเค—เคพ เคจเคพเคนเฅ€"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "เค‰เค—เคฎ เค…เคฐเฅเค•เคพเคˆเคตเฅเคนเคœ เคšเคพ %sB/%sB เค˜เฅ‡เคฃเฅเคฏเคพเคšเฅ€ เค—เคฐเคœ เค†เคนเฅ‡.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "เค‰เค—เคฎ เค…เคฐเฅเค•เคพเคˆเคตเฅเคนเคœเคšเคพ %sB เค˜เฅ‡เคฃเฅเคฏเคพเคšเฅ€ เค—เคฐเคœ เค†เคนเฅ‡.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s เค‰เค—เคฎ เค˜เฅเคฏเคพ\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "เค•เคพเคนเฅ€ เค…เคฐเฅเค•เคพเคˆเคตเฅเคนเคœ เค†เคฃเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s เคฎเคงเฅเคฏเฅ‡ เค†เคงเฅ€เคš เค‰เค˜เคกเคฒเฅ‡เคฒเฅเคฏเคพ เค‰เค—เคฎเคพเคคเฅ€เคฒ เค‰เค˜เคกเคฒเฅ‡เคฒเฅเคฏเคพเคฒเคพ เคธเฅ‹เคกเฅ‚เคจ เคฆเฅเคฏเคพ เค•เคฟเค‚เคตเคพ เคตเค—เคณเคพ\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' เค†เคœเฅเคžเคพ เคธเฅเคŸเฅเคฏเคพ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' เคชเฅ…เค•เฅ‡เคœ เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เค•เฅ‡เคฒเฅ‡ เค†เคนเฅ‡ เค•เคพ เคคเฅ‡ เคชเคกเคคเคพเคณเฅ‚เคจ เคชเคนเคพ.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "เคฌเคพเค‚เคงเคฃเฅ€ เค•เคฐเคฃเคพเคฑเฅเคฏเคพ เค†เคœเฅเคžเคพ '%s' เค…เคฏเคถเคธเฅเคตเฅ€.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "เคšเคพเคˆเคฒเฅเคก เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค…เคฏเคถเคธเฅเคตเฅ€"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "เคฌเคฟเคฒเฅเคกเฅ‡เคชเคธเฅ เค•เคถเคพเคธเคพเค เฅ€ เคคเฅ‡ เคชเคกเคคเคพเคณเคฃเฅเคฏเคพเคธเคพเค เฅ€ เค•เคฟเคฎเคพเคจ เคเค• เคชเฅ…เค•เฅ‡เคœ เคธเคพเค‚เค—เคฃเฅ‡ เค—เคฐเคœเฅ‡เคšเฅ‡ เค†เคนเฅ‡"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s เคธเคพเค เฅ€ เคฌเคพเค‚เคงเคฃเฅ€ เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€ เคฎเคพเคนเคฟเคคเฅ€ เคฎเคฟเคณเคตเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s เคฒเคพ เคฌเคพเค‚เคงเคฃเฅ€ เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธ เคจเคพเคนเฅ€เคค.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s เคชเฅ…เค•เฅ‡เคœ เคจ เคธเคพเคชเคกเคฒเฅเคฏเคพเคจเฅ‡ %s เคธเคพเค เฅ€ %s เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคŠ เคถเค•เคค เคจเคพเคนเฅ€"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s เคชเฅ…เค•เฅ‡เคœ เคจ เคธเคพเคชเคกเคฒเฅเคฏเคพเคจเฅ‡ %s เคธเคพเค เฅ€ %s เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคŠ เคถเค•เคค เคจเคพเคนเฅ€"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s เค…เคตเคฒเค‚เคฌเคฟเคคเฅเคต %s เคธเคพเค เฅ€ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ: เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เคชเฅ…เค•เฅ‡เคœ %s เค–เฅ‚เคชเคš เคจเคตเฅ€เคจ เค†เคนเฅ‡"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -974,37 +982,37 @@ msgstr ""
 "เค†เคตเฅƒเคคเฅ€เคšเฅ€ เคฎเคพเค—เคฃเฅ€ เคชเฅ‚เคฐเฅเคฃ เค•เคฐเคฃเฅเคฏเคพเคธเคพเค เฅ€ %s เคชเฅ…เค•เฅ‡เคœเคšเฅ€ เค†เคตเฅƒเคคเฅเคคเฅ€ เค‰เคชเคฒเคฌเฅเคง เคจเคพเคนเฅ€,เคคเฅเคฏเคพเคฎเฅเคณเฅ‡ %s เคธเคพเค เฅ€ %s "
 "เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคŠ เคถเค•เคค เคจเคพเคนเฅ€"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s เคชเฅ…เค•เฅ‡เคœ เคจ เคธเคพเคชเคกเคฒเฅเคฏเคพเคจเฅ‡ %s เคธเคพเค เฅ€ %s เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคŠ เคถเค•เคค เคจเคพเคนเฅ€"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s เคธเคพเค เฅ€ %s เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s เคธเคพเค เฅ€ เคฌเคพเค‚เคงเคฃเฅ€-เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€เคœ เคชเฅ‚เคฐเฅเคฃ เคนเฅ‹เคŠ เคถเค•เคค เคจเคพเคนเฅ€."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "เคฌเคพเค‚เคงเคฃเฅ€-เคกเคฟเคชเฅ‡เค‚เคกเคจเฅเคธเฅ€เคœ เค•เฅเคฐเคฟเคฏเคพ เคชเฅ‚เคฐเฅเคฃ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ "
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) เคฒเคพ เคœเฅ‹เคกเคค เค†เคนเฅ‡"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "เคชเฅเคฐเฅ‹เค—เฅเคฐเคพเคฎ เค—เคŸเคพเคฒเคพ เคคเคพเค‚เคคเฅเคฐเคฟเค• เคฎเคฆเคค เคฆเคฟเคฒเฅ€:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1091,7 +1099,7 @@ msgstr ""
 " apt.conf(5)  เคชเฅเคธเฅเคคเคฟเค•เคพ เคชเคพเคจเฅ‡ เคชเคนเคพ.\n"
 "         เคนเฅเคฏเคพ APT เคฒเคพ เคธเฅเคชเคฐ เค•เคพเคŠ เคชเฅ‰เคตเคฐเฅเคธ เค†เคนเฅ‡เคค\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1162,7 +1170,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s เคนเฅ€ เค†เคงเฅ€เคš เคจเคตเคฟเคจ เค†เคตเฅƒเคคเฅเคคเฅ€ เค†เคนเฅ‡.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s เคธเคพเค เฅ€ เคฅเคพเค‚เคฌเคฒเฅ‹ เคชเคฃ เคคเฅ‡ เคคเฅ‡เคฅเฅ‡ เคจเคตเฅเคนเคคเฅ‡"
@@ -1300,8 +1309,8 @@ msgstr "เคตเฅ‡เคณเฅ‡เค…เคญเคพเคตเฅ€ เคธเค‚เคฌเค‚เคง เคœเฅ‹เคกเคคเคพ เคฏเฅ‡เคค เค
 msgid "Server closed the connection"
 msgstr "เคธเคฐเฅเคตเฅเคนเคฐเคจเฅ‡ เคธเค‚เคฌเค‚เคง เคœเฅ‹เคกเคฃเฅ€ เคฌเค‚เคฆ เค•เฅ‡เคฒเฅ€"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "เคคเฅเคฐเฅเคŸเฅ€ เคตเคพเคšเคพ"
 
@@ -1314,8 +1323,8 @@ msgid "Protocol corruption"
 msgstr "เคชเฅเคฐเฅ‹เคŸเฅ‹เค•เฅ‰เคฒ เค–เคฐเคพเคฌ เคเคพเคฒเฅ‡"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคค เคคเฅเคฐเฅเคŸเฅ€"
 
@@ -1369,7 +1378,7 @@ msgstr "เคกเฅ‡เคŸเคพ เคธเฅ‰เค•เฅ‡เคŸ เคœเฅ‹เคกเคฃเฅ€ เคตเฅ‡เคณเฅ‡เค…เคญเคพเคตเฅ€
 msgid "Unable to accept connection"
 msgstr "เคœเฅ‹เคกเคฃเฅ€ เคธเฅเคตเคฟเค•เคพเคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "เคซเคพเคˆเคฒ เคนเฅ…เคถ เค•เคฐเคฃเฅเคฏเคพเคค เคคเฅเคฐเฅเคŸเฅ€"
 
@@ -1396,87 +1405,100 @@ msgstr "เคชเฅเคฐเคถเฅเคจ"
 msgid "Unable to invoke "
 msgstr "เคœเคพเคฐเฅ€ เค•เคฐเคฃเฅเคฏเคพเคธ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) เคฒเคพ เคœเฅ‹เคกเคค เค†เคนเฅ‡"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[เค†เคฏเคชเฅ€:%s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) เคธเคพเค เฅ€ เคธเฅ‰เค•เฅ‡เคŸ เคคเคฏเคพเคฐ เค•เคฐเฅ‚ เคถเค•เคค เคจเคพเคนเฅ€"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s). เคธเคพเค เฅ€ เคœเฅ‹เคกเคฃเฅ€ เค‡เคจเคฟเคถเคฟเคเคŸ/เคชเฅเคขเคพเค•เคพเคฐเฅ€เคค เค•เคฐเฅ‚ เคถเค•เคค เคจเคพเคนเฅ€"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) เคฒเคพ เคœเฅ‹เคกเฅ‚ เคถเค•เคค เคจเคพเคนเฅ€,เคœเฅ‹เคกเคฃเฅ€ เคตเฅ‡เคณเฅ‡เค…เคญเคพเคตเฅ€ เคคเฅเคŸเคฒเฅ€"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s (%s) เคฒเคพ เคœเฅ‹เคกเฅ‚ เคถเค•เคค เคจเคพเคนเฅ€"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s เคฒเคพ เคœเฅ‹เคกเคค เค†เคนเฅ‡"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "%s เคฐเคฟเคเฅ‰เคฒเฅเคตเฅเคน เคนเฅ‹เคŠ เคถเค•เคค เคจเคพเคนเฅ€ "
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' เคฐเคฟเคเฅ‰เคฒเฅเคตเฅเคน เค•เคฐเคคเคพเคจเคพ เคคเคพเคคเฅเคชเฅเคฐเคคเฅ€ เคคเฅเคฐเฅเคŸเฅ€"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "%s:%s' (%i) เคฐเคฟเคเฅ‰เคฒเฅเคตเฅเคน เคนเฅ‹เคค เค…เคธเคคเคพเคจเคพ เค•เคพเคนเฅ€เคคเคฐเฅ€ เคตเคพเคˆเคŸ เค˜เคกเคฒเฅ‡"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "%s:%s' (%i) เคฐเคฟเคเฅ‰เคฒเฅเคตเฅเคน เคนเฅ‹เคค เค…เคธเคคเคพเคจเคพ เค•เคพเคนเฅ€เคคเคฐเฅ€ เคตเคพเคˆเคŸ เค˜เคกเคฒเฅ‡"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s เคฒเคพ เคœเฅ‹เคกเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "เค…เค‚เคคเคฐเฅเค—เคค เคคเฅเคฐเฅเคŸเฅ€: เคšเคพเค‚เค—เคฒเฅ€ เคธเคนเฅ€, เคชเคฃ เค•เฅ€ เค เคธเฅ‡ เคธเคพเค‚เค—เฅ‚ เคถเค•เคค เคจเคพเคนเฅ€?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "เค•เคฟเคฎเคพเคจ เคเค• เค…เคตเฅˆเคง เคธเคนเฅ€ เคธเคพเคชเคกเคฒเฅ€."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "เคธเคนเฅ€เคšเฅ€ เค–เคพเคคเฅเคฐเฅ€ เค•เคฐเคฃเฅเคฏเคพเคธเคพเค เฅ€ '%s' เค•เคพเคฐเฅเคฏเคพเคจเฅเคตเคฟเคค เค•เคฐเฅ‚ เคถเค•เคค เคจเคพเคนเฅ€ (gpgv เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เค•เฅ‡เคฒเฅ‡ เค†เคนเฅ‡ เค•เคพ?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "gpgv เค•เคพเคฐเฅเคฏเคพเคจเฅเคตเคฟเคค เคนเฅ‹เคค เค…เคธเคคเคพเคจเคพ เค…เคชเคฐเคฟเคšเคฟเคค เคคเฅเคฐเฅเคŸเฅ€"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "เค–เคพเคฒเฅ€เคฒ เคธเคนเฅเคฏเคพ เค…เคตเฅˆเคง เค†เคนเฅ‡เคค:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1514,53 +1536,53 @@ msgstr "HTTP เคธเคฐเฅเคตเฅเคนเคฐเคจเฅ‡ เคตเคฟเคธเฅเคคเคพเคฐ เคคเคพเค‚เคคเฅเค
 msgid "Unknown date format"
 msgstr "เค…เคชเคฐเคฟเคšเคฟเคค เคฆเคฟเคจเคพเค‚เค• เคชเฅเคฐเค•เคพเคฐ/เคธเฅเคตเคฐเฅ‚เคช "
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "เคšเฅเค•เคฒเฅ‡/เค…เคธเคฎเคฐเฅเคฅ เคจเคฟเคตเคก เค•เคฐเคพ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "เคœเฅ‹เคกเคฃเฅ€ เคตเฅ‡เคณเฅ‡เค…เคญเคพเคตเฅ€ เคคเฅเคŸเคฒเฅ€"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "เคจเคฟเคฐเฅเค—เคค เคซเคพเคˆเคฒ เคฎเคงเฅเคฏเฅ‡ เคฒเคฟเคนเคฟเคคเคพเคจเคพ เคคเฅเคฐเฅเคŸเฅ€/เคšเฅ‚เค•"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "เคซเคพเคˆเคฒ เคฎเคงเฅเคฏเฅ‡ เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคค เคšเฅ‚เค•/เคคเฅเคฐเฅเคŸเฅ€"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "เคซเคพเคˆเคฒ เคฎเคงเฅเคฏเฅ‡ เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคค เคšเฅ‚เค•/เคคเฅเคฐเฅเคŸเฅ€"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เคธเคฐเฅเคตเฅเคนเคฐ เคฎเคงเฅ‚เคจ เคตเคพเคšเคฃเฅเคฏเคพเคค เคšเฅ‚เค•. เคฒเคพเค‚เคฌ เคถเฅ‡เคตเคŸ เค†เคฃเคฟ เคฌเค‚เคฆ เคเคพเคฒเฅ‡เคฒเฅ€ เคœเฅ‹เคกเคฃเฅ€"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "เคธเคฐเฅเคตเฅเคนเคฐ เคฎเคงเฅ‚เคจ เคตเคพเคšเคฃเฅเคฏเคพเคค เคšเฅ‚เค•"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "เคšเฅเค•เฅ€เคšเคพ เคถเฅ€เคฐเฅเคทเค• เคกเคพเคŸเคพ"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "เคœเฅ‹เคกเคฃเฅ€ เค…เคฏเคถเคธเฅเคตเฅ€"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "เค…เค‚เคคเคฐเฅเค—เคค เคคเฅเคฐเฅเคŸเฅ€"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s เคตเคพเคšเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
@@ -1587,7 +1609,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "%s เคซเคพเคˆเคฒ เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "%s เคซเคพเคˆเคฒ เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1680,7 +1707,7 @@ msgstr ""
 "  -c=?  เคนเฅ€ เคธเค‚เคฐเคšเคจเคพ เคธเค‚เคšเคฟเค•เคพ เคตเคพเคšเคพ \n"
 " -o=?  เคเค–เคพเคฆเคพ เค…เคนเฅ‡เคคเฅเค• เคธเค‚เคฐเคšเคจเคพ เคชเคฐเฅเคฏเคพเคฏ เคจเคฟเคฐเฅเคงเคพเคฐเคฟเคค เค•เคฐเคพ เคœเคธเฅ‡-  -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s เคฎเคงเฅเคฏเฅ‡ เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ "
@@ -1827,8 +1854,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "%s: %s DB เคธเค‚เคšเคฟเค•เคพ เค‰เค˜เคกเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s เคธเฅเคŸเฅ‡เคŸ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
@@ -1841,87 +1868,87 @@ msgstr "เค…เคฐเฅเค•เคพเคˆเคตเฅเคน เคฎเคงเฅเคฏเฅ‡ เคจเคฟเคฏเค‚เคคเฅเคฐเคฃ เคฎ
 msgid "Unable to get a cursor"
 msgstr "เคธเค‚เค•เฅ‡เคคเค• เค˜เฅ‡เคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "เคงเฅ‹เค•เฅเคฏเคพเคšเฅ€ เคธเฅ‚เคšเคจเคพ:%s เคธเค‚เคšเคฏเคฟเค•เคพ เคตเคพเคšเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ \n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "เคงเฅ‹.เคธเฅ‚.:%s เคธเฅเคŸเฅ‡เคŸ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E:"
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "เคงเฅ‹.เคธเฅ‚.:"
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "เคˆ: เคธเค‚เคšเคฟเค•เฅ‡เคฒเคพ เคฒเคพเค—เฅ‚ เคนเฅ‹เคฃเคพเคฑเฅเคฏเคพ เคšเฅเค•เคพ"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s เคธเฅ‹เคกเคตเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "เคŸเฅเคฐเฅ€ เคšเคพเคฒเคฃเฅ‡ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s เค‰เค˜เคกเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "%s [%s] เคกเฅ€ เคฆเฅเคตเคพ\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s เคตเคพเคšเคฃเคพเคฐเคพ เคฆเฅเคตเคพ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s เคฆเฅเคตเคพ เค•เคพเคขเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "%s เคšเคพ %s เคฆเฅเคตเคพ เคธเคพเคงเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "%sB เคนเฅ€เคŸ เคšเฅ€ เคกเคฟเคฒเฅ€เค‚เค• เคฎเคฐเฅเคฏเคพเคฆเคพ\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "เค…เคฐเฅเค•เคพเคˆเคตเฅเคน เคฒเคพ เคชเฅ…เค•เฅ‡เคœ เคœเคพเค—เคพ เคจเคพเคนเฅ€"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s เคฒเคพ เค“เคตเฅเคนเคฐเคฐเคพเคˆเคก/เคฆเฅเคฐเฅเคฒเค•เฅเคทเคฟเคค เคœเคพเค—เคพ เคจเคพเคนเฅ€\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "%s เคฆเฅ‡เค–เคญเคพเคฒเค•เคฐเฅเคคเคพ เคนเคพ %s เค†เคฃเคฟ %s เคจเคพเคนเฅ€ \n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "%s เคฒเคพ เค‰เค—เคฎ เค“เคตเฅเคนเคฐเคฐเคพเคˆเคก/เคฆเฅเคฐเฅเคฒเค•เฅเคทเคฟเคค เคœเคพเค—เคพ เคจเคพเคนเฅ€\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "%s เคฒเคพ เคฆเฅเคตเคฏเค‚เค• เค“เคตเฅเคนเคฐเคฐเคพเคˆเคก เคœเคพเค—เคพ เคจเคพเคนเฅ€\n"
@@ -1995,7 +2022,7 @@ msgstr "MD5 เค•เคพเคฎเคชเฅเคฏเฅเคŸเฅ€เค‚เค— เค•เคฐเคคเคพเค‚เคจเคพ เคตเคพเคšเคฃ
 msgid "Problem unlinking %s"
 msgstr "%s เคฆเฅเคตเคพ เคฎเฅ‹เค•เคณเคพ/เคธเฅเคŸเคพ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคกเคšเคฃ"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s เคฒเคพ เคชเฅเคจเคฐเฅเคจเคพเคฎเคพเค‚เค•เคจ %s เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ "
@@ -2054,23 +2081,23 @@ msgstr ""
 "   -c=?   เคนเฅ€ เคธเค‚เคฐเคšเคจเคพ เคซเคพเคˆเคฒ เคตเคพเคšเคพ\n"
 "   -o=?-  เค…เคจเคฟเคฏเค‚เคคเฅเคฐเคฟเคค เคธเค‚เคฐเคšเคจเคพ เคชเคฐเฅเคฏเคพเคฏ เคจเคฟเคถเฅเคšเคฟเคค เค•เคฐเคพ,eg -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "เคชเคพเคˆเคช เคคเคฏเคพเคฐ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "exec gzip เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "เคฌเคฟเค˜เคกเคฒเฅ‡เคฒเฅ€ เค…เคฐเฅเค•เคพเคˆเคตเฅเคนเคœ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "เคŸเคพเคฐ(เคŸเฅ‡เคชเค…เคฐเฅเค•เคพเคˆเคตเฅเคน) เคšเฅ‡เค•เคธเคฎ เคšเฅเค•เคฒเคพ, เคฌเคฟเค˜เคกเคฒเฅ‡เคฒเฅ€ เค…เคฐเฅเค•เคพเคˆเคตเฅเคน"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "เค…เคชเคฐเคฟเคšเคฟเคค TAR เคถเฅ€เคฐเฅเคทเค• เคชเฅเคฐเค•เคพเคฐ %u, เคฎเฅ‡เค‚เคฌเคฐ %s"
@@ -2141,54 +2168,54 @@ msgstr "%s เคซเคพเคˆเคฒ เคฎเคงเฅเคฏเฅ‡ เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐ
 msgid "Failed to close file %s"
 msgstr "%s เคซเคพเคˆเคฒ เคฌเค‚เคฆ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "เคฎเคพเคฐเฅเค— %s เคนเคพ เค–เฅ‚เคช เคฒเคพเค‚เคฌ เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s เคเค•เคพเคชเฅ‡เค•เฅเคทเคพ เคœเคพเคธเฅเคค เคตเฅ‡เคณเคพ เค‰เค˜เคกเคค เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s เคธเค‚เคšเคฟเค•เคพ เคกเคพเคฏเคตเฅเคนเคฐเฅเคŸ เค•เฅ‡เคฒเฅ€ เค†เคนเฅ‡/เคตเคณเคตเคฒเฅ€ เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "เคกเคพเคฏเคตเฅเคนเคฐเฅเคœเคจ เค‡เคšเฅเค›เคฟเคค %s/%s เคฎเคงเฅเคฏเฅ‡ เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคšเคพ เคชเฅ…เค•เฅ‡เคœ เคชเฅเคฐเคฏเคคเฅเคจ เค•เคฐเคค เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "เคกเคพเคฏเคตเฅเคนเคฐเฅเคœเคจ เคฎเคพเคฐเฅเค— เคนเคพ เค–เฅ‚เคช เคฒเคพเค‚เคฌ เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s เคธเค‚เคšเคฟเค•เคพ เคนเฅ€ เคธเค‚เคšเคฟเค•เคพ เคจเคธเคฒเฅ‡เคฒเฅเคฏเคพ เคธเค‚เคšเคฟเค•เฅ‡เคฌเคฐเฅ‹เคฌเคฐ เคฌเคฆเคฒเคฒเฅ‡เคฒเฅ€ เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "เคจเฅ‹เคกเคšเฅ‡ เคคเฅเคฏเคพเคšเฅเคฏเคพ เคนเฅ…เคถ เคฌเค•เฅ‡เคŸเคฎเคงเฅเคฏเฅ‡/เคฌเคพเคฆเคฒเฅ€เคค เคธเฅเคฅเคพเคจ เคจเคฟเคถเฅเคšเคฟเคค เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "เคฎเคพเคฐเฅเค— เค–เฅ‚เคช เคฒเคพเค‚เคฌ เค†เคนเฅ‡"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s เคšเฅเคฏเคพ เค†เคตเฅƒเคคเฅเคคเฅ€เคถเฅ€ เคชเฅเคจเคƒ เคฒเคฟเคนเคฟเคฒเฅ‡เคฒเฅเคฏเคพ เคชเฅ…เค•เฅ‡เคœ เคœเฅเคณเคค เคจเคพเคนเฅ€"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s, %s เคชเฅ…เค•เฅ‡เคœ เคฎเคงเคฒเฅเคฏเคพ เคเค•เคพ เคตเคฐ เคชเฅเคจเคฐเฅเคฒเคฟเค–เคฟเคค เคนเฅ‹เคคเฅ‡"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s เคธเฅเคŸเฅ…เคŸ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
@@ -2266,30 +2293,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s เคจเคฟเคตเคกเค• เคญเคพเค— เคธเคพเคชเคกเคค เคจเคพเคนเฅ€"
@@ -2359,6 +2386,16 @@ msgstr "%c%s... เคšเฅ‚เค•/เคคเฅเคฐเฅเคŸเฅ€!"
 msgid "%c%s... Done"
 msgstr "%c%s... เคเคพเคฒเฅ‡"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... เคเคพเคฒเฅ‡"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2419,114 +2456,120 @@ msgstr "เคธเฅ€เคกเฅ€-เคฐเฅ‰เคฎ เคธเฅเคŸเฅ…เคŸ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเค
 msgid "Problem closing the gzip file %s"
 msgstr "เคซเคพเคˆเคฒ เคฌเค‚เคฆ เค•เคฐเคฃเฅเคฏเคพเคค เค…เคกเคšเคฃ"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "เคซเค•เฅเคค เคตเคพเคšเคฃเฅเคฏเคพเคธเคพเค เฅ€ เค•เฅเคฒเฅ‚เคช เคธเค‚เคšเคฟเค•เคพ %s เคธเคพเค เฅ€ เค•เฅเคฒเฅ‚เคชเคฌเค‚เคฆเคšเคพ เคตเคพเคชเคฐ เค•เคฐเฅ€เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s เค•เฅเคฒเฅ‚เคช เคซเคพเคˆเคฒ เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "%s nfs(เคจเฅ‡เคŸเคตเคฐเฅเค• เคซเคพเคˆเคฒ เคธเคฟเคธเฅเคŸเฅ€เคฎ) เคฎเคพเคŠเค‚เคŸเฅ‡เคก เค•เฅเคฒเฅเคช เคซเคพเคˆเคฒ เคฒเคพ เค•เฅเคฒเฅเคช /เคฌเค‚เคฆ เค•เคฐเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s เค•เฅเคฒเฅเคช เคฎเคฟเคณเคตเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s เค‰เคชเค•เฅเคฐเคฟเคฏเฅ‡เคฒเคพ เคธเฅ‡เค—เคฎเฅ‡เค‚เคŸเฅ‡เคถเคจ เคฆเฅ‹เคท เคชเฅเคฐเคพเคชเฅเคค เคเคพเคฒเคพ."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s เค‰เคชเค•เฅเคฐเคฟเคฏเฅ‡เคฒเคพ เคธเฅ‡เค—เคฎเฅ‡เค‚เคŸเฅ‡เคถเคจ เคฆเฅ‹เคท เคชเฅเคฐเคพเคชเฅเคค เคเคพเคฒเคพ."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s เค‰เคชเค•เฅเคฐเคฟเคฏเฅ‡เคจเฅ‡ (%u) เคคเฅเคฐเฅเคŸเฅ€ เค•เฅ‹เคก เคฆเคฟเคฒเฅ‡เคฒเคพ เค†เคนเฅ‡"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s เค‰เคชเค•เฅเคฐเคฟเคฏเคพ เค…เคšเคพเคจเค•เคชเคฃเฅ‡ เคฌเคพเคนเฅ‡เคฐ เคชเคกเคฒเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s เคซเคพเคˆเคฒ เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s เคธเคพเค เฅ€ เคชเคพเคˆเคช เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "เค†เคฏเคชเฅ€เคธเฅ€ เค‰เคชเค•เฅเคฐเคฟเคฏเคพ เคคเคฏเคพเคฐ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "เคฆเคพเคฌเค•(เคธเค‚เค•เคฒเคฟเคคเค•เคฐเฅเคคเคพ) เค•เคฐเฅเคฏเคพเคจเฅเคตเคฟเคค เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "เคตเคพเคšเคพ, %lu เค…เคœเฅ‚เคจเคนเฅ€ เคตเคพเคšเคฃเฅเคฏเคพเคธเคพเค เฅ€ เค†เคนเฅ‡ เคชเคฃ เค†เคคเคพ เค•เคพเคนเฅ€ เค‰เคฐเคฒเฅ€ เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "เคฒเคฟเคนเคพ, %lu เค…เคœเฅ‚เคจเคนเฅ€ เคฒเคฟเคนเคฟเคฃเฅเคฏเคพเคธเคพเค เฅ€ เค†เคนเฅ‡ เคชเคฃ เคฒเคฟเคนเคฟเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "เคซเคพเคˆเคฒ เคฌเค‚เคฆ เค•เคฐเคฃเฅเคฏเคพเคค เค…เคกเคšเคฃ"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "เคธเค‚เคšเคฟเค•เฅ‡เคšเฅ€ syncing เคธเคฎเคธเฅเคฏเคพ"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "เคซเคพเคˆเคฒ เค…เคจเคฒเคฟเค‚เค•เคฟเค‚เค— เค•เคฐเคฃเฅเคฏเคพเคค เค…เคกเคšเคฃ"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "เคธเค‚เคšเคฟเค•เฅ‡เคšเฅ€ syncing เคธเคฎเคธเฅเคฏเคพ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "เคธเค‚เคธเฅเคฅเคพเคชเคจ เค–เค‚เคกเคฟเคค เค•เคฐเคค เค†เคนเฅ‡."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "เคชเฅ…เค•เฅ‡เคœ เค…เคธเฅเคฅเคพเคˆ เคธเฅเคฎเฅƒเคคเคฟเค•เฅ‹เคท"
@@ -2553,59 +2596,59 @@ msgstr "'%s' เค†เคตเฅƒเคคเฅเคคเฅ€เค•เคฐเคฃ เคชเฅเคฐเคฃเคพเคฒเฅ€เคฒเคพ เคนเฅ‡ A
 msgid "The package cache was built for a different architecture"
 msgstr "เคชเฅ…เค•เฅ‡เคœ เค…เคธเฅเคฅเคพเคˆ เคธเฅเคฎเฅƒเคคเฅ€เค•เฅ‹เคท เคตเฅ‡เค—เคณเฅเคฏเคพ เคตเคพเคธเฅเคคเฅเคตเคฟเคฆเฅเคฏเฅ‡ เคธเคพเค เฅ€ เคฌเคจเคตเคฒเคพ เค—เฅ‡เคฒเคพ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "เค…เคตเคฒเค‚เคฌเคฟเคค"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "เคชเฅ‚เคฐเฅเคต เค…เคตเคฒเค‚เคฌเคฟเคค"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "เคธเฅเคšเคตเคฃเฅ‡"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "เคถเคฟเคซเคพเคฐเคธ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "เคชเคฐเคธเฅเคชเคฐเคตเคฟเคฐเฅ‹เคง"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "เคชเคฐเคค เคคเฅเคฏเคพเค เคฟเค•เคพเคฃเฅ€ เค†เคฃเคพ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "เค…เคชเฅเคฐเคšเคฒเคฟเคค"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "เคคเฅ‹เคกเคฒเฅ‡"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "เค…เคคเฅเคฏเคพเคตเคถเฅเคฏเค•"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "เค†เคตเคถเฅเคฏเค•"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "เคฎเคพเคจเค•"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "เคเคšเฅเค›เคฟเค•"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "เค…เคงเคฟเค•"
 
@@ -2705,29 +2748,29 @@ msgstr "%s เค‰เค˜เคกเคค เค†เคนเฅ‡"
 msgid "Line %u too long in source list %s."
 msgstr "%s เคธเฅเคคเฅเคฐเฅ‹เคค เคธเฅเคšเฅ€เคฎเคงเฅเคฏเฅ‡ เค“เคณ %u เค–เฅ‚เคช เคฒเคพเค‚เคฌ เค†เคนเฅ‡."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "เคธเฅเคคเฅเคฐเฅ‹เคค เคธเฅเคšเฅ€ %s (เคชเฅเคฐเค•เคพเคฐ) เคฎเคงเฅเคฏเฅ‡ %u เคตเคพเคˆเคŸ/เคตเฅเคฏเค‚เค— เคฐเฅ‡เคทเคพ"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "%s เคธเฅเคคเฅเคฐเฅ‹เคค เคธเฅเคšเฅ€เคฎเคงเฅเคฏเฅ‡ %u เคฐเฅ‡เคทเฅ‡เคตเคฐ '%s' เคชเฅเคฐเค•เคพเคฐ เคฎเคพเคนเคฟเคค เคจเคพเคนเฅ€ "
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "%s เคซเคพเคˆเคฒ เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2750,7 +2793,7 @@ msgid ""
 msgstr ""
 "%s เคชเฅ…เค•เฅ‡เคœ เคชเฅเคจเคƒ:เค…เคงเคฟเคทเฅเค เคพเคชเคฟเคค เค•เคฐเคฃเฅเคฏเคพเคšเฅ€ เค—เคฐเคœ เค†เคนเฅ‡, เคชเคฐเค‚เคคเฅ เคฎเคฒเคพ เคคเฅเคฏเคพเคธเคพเค เฅ€ เค‘เคฐเฅเค•เคพเค‡เคตเฅเคน เคธเคพเคชเคกเฅ‚ เคถเค•เคฒเฅ‡ เคจเคพเคนเฅ€."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2758,11 +2801,11 @@ msgstr ""
 "เคฆเฅ‹เคท,เคชเฅ…เค•เฅ‡เคœ เคธเคฎเคธเฅเคฏเคพ เคจเคฟเคตเคพเคฐเค•::เคจเคฟเคตเคพเคฐเคฃ  เค•เคฐเคคเคพเค‚เคจเคพ เค…เคกเคฅเคณเคพ เคจเคฟเคฐเฅเคฎเคพเคฃ เคเคพเคฒเคพ, เคนเฅเคฏเคพเคšเฅ‡ เค•เคพเคฐเคฃ เคธเฅเคฅเค—เคฟเคค  "
 "เคชเฅ…เค•เฅ‡เคœเฅ‡เคธ เค…เคธเฅ‚ เคถเค•เคคเฅ‡."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "เค…เคกเคšเคฃเฅ€ เคฆเฅ‚เคฐ เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ, เคคเฅเคฎเฅเคนเฅ€ เคคเฅเคŸเคฒเฅ‡เคฒเฅ‡ เคชเฅ…เค•เฅ‡เคœ เค˜เฅ‡เคคเคฒเฅ‡เคฒเฅ‡ เค†เคนเฅ‡."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2771,7 +2814,7 @@ msgstr ""
 "เค•เคพเคนเฅ€ เค…เคจเฅเค•เฅเคฐเคฎเคฃเคฟเค•เคพ เคธเค‚เคšเคฏเคฟเค•เคพ เคกเคพเคŠเคจเคฒเฅ‹เคก    เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ,เคคเฅเคฏเคพ เคฆเฅเคฐเฅเคฒเค•เฅเคทเคฟเคค เคเคพเคฒเฅเคฏเคพ, เค•เคฟเค‚เคตเคพ "
 "เคคเฅเคฏเคพเคเคตเคœเฅ€ เคœเฅเคจเฅเคฏเคพ เคตเคพเคชเคฐเคฒเฅเคฏเคพ เค—เฅ‡เคฒเฅเคฏเคพ."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "เคธเค‚เคšเคฏเคฟเค•เคพ เคฏเคพเคฆเฅ€เคค %s เคชเคพเคฐเฅเคถเคฒ เคนเคฐเคตเคฒเฅ‡ เค†เคนเฅ‡."
@@ -2808,17 +2851,17 @@ msgstr "%s เค•เคพเคฐเฅเคฏเคชเคงเฅเคฆเคคเฅ€เคšเคพ เคกเฅเคฐเคพเค‡เคตเฅเคนเคฐ เ
 msgid "Method %s did not start correctly"
 msgstr "%s เค•เคพเคฐเฅเคฏเคชเคงเฅเคฆเคคเฅ€ เคฏเฅ‹เค—เฅเคฏ เคฐเฅ€เคคเฅ€เคจเฅ‡ เคธเฅเคฐเฅ เคเคพเคฒเฅ‡เคฒเฅ€ เคจเคพเคนเฅ€"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "เค•เฅƒเคชเคฏเคพ '%s' เคฒเฅ‡เคฌเคฒ เค…เคธเคฒเฅ‡เคฒเฅ€ เคกเคฟเคธเฅเค• '%s' เคฏเคพ เคกเฅเคฐเคพเค‡เคตเฅเคนเคฎเคงเฅเคฏเฅ‡ เค เฅ‡เคตเคพ เค†เคฃเคฟ เคเคจเฅเคŸเคฐ เค•เคณ เคฆเคพเคฌเคพ."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' เคชเฅ…เค•เฅ‡เคœเฅ€เค‚เค— เคชเฅเคฐเคฃเคพเคฒเฅ€ เคธเคนเคพเคฏเฅเคฏเค•เคพเคฐเฅ€ เคจเคพเคนเฅ€"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "เคฏเฅ‹เค—เฅเคฏ เค…เคธเคพ เคชเฅ…เค•เฅ‡เคœเคฟเค‚เค— เคชเฅเคฐเคฃเคพเคฒเฅ€ เคชเฅเคฐเค•เคพเคฐ เคจเคฟเคถเฅเคšเคฟเคค เค•เคฐเคฃเฅเคฏเคพเคธ เค…เคธเคฎเคฐเฅเคฅ "
 
@@ -2871,14 +2914,14 @@ msgstr "เค…เคธเฅเคฅเคพเคฏเฅ€ เคธเฅเคฎเฅƒเคคเคฟเค•เฅ‹เคท เคฎเคงเฅเคฏเฅ‡ เคตเคฟ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "%s (เคชเฅ…เค•เฅ‡เคœ เคถเฅ‹เคงเคคเคพเค‚เคจเคพ) เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค•เคฐเฅ€เคค เค…เคธเคคเคพเค‚เคจเคพ เคฆเฅ‹เคท เค†เคขเคณเฅ‚เคจ เค†เคฒเคพ"
@@ -2904,26 +2947,26 @@ msgstr ""
 "เค…เคฐเฅ‡เคตเคพ!, เคคเฅเคฎเฅเคนเฅ€ เคคเคฐ เคนเฅเคฏเคพ เคเคชเคฟเคŸเฅ€เคšเฅเคฏเคพ เค•เคพเคฐเฅเคฏเค•เฅเคทเคฎเคคเฅ‡เคชเฅ‡เค•เฅเคทเคพเคนเฅ€ เค…เคตเคฒเค‚เคฌเคฟเคค/เคตเคฟเคธเค‚เคฌเฅ‚เคจ เค…เคธเคฒเฅ‡เคฒเฅเคฏเคพ เคธเค‚เค–เฅเคฏเฅ‡เคšเฅ€ เคฎเคฐเฅเคฏเคพเคฆเคพ "
 "เค“เคฒเคพเค‚เคกเคฒเฅ€ เค†เคนเฅ‡."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "เค…เคตเคฒเค‚เคฌเคฟเคค/เคตเคฟเคธเค‚เคฌเฅ‚เคจ เค…เคธเคฃเคพเคฑเฅเคฏเคพ เคธเค‚เคšเคฟเค•เคพเค‚เคšเฅ€ เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค•เคฐเฅ€เคค เค…เคธเคคเคพเค‚เคจเคพ เคชเฅ…เค•เฅ‡เคœ %s %s เคธเคพเคชเคกเคฒเฅ‡ เคจเคพเคนเฅ€ "
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "%s เค‰เค—เคฎ เคชเฅ…เค•เฅ‡เคœ เคฏเคพเคฆเฅ€ เคธเฅเคฐเฅ‚ เค•เคฐเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "เคชเฅ…เค•เฅ‡เคœ เคฏเคพเคฆเฅเคฏเคพ เคตเคพเคšเคค เค†เคนเฅ‹เคค"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "เคคเคฐเคคเฅ‚เคฆ/เคชเฅเคฐเคตเคฒเฅ‡เคฒเฅเคฏเคพ เคธเค‚เคšเคฟเค•เคพ เคธเค‚เค—เฅเคฐเคนเคฟเคค เค•เคฐเฅ€เคค เค†เคนเฅ‡"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO เคคเฅเคฐเฅเคŸเฅ€ เค‰เค—เคฎ เคจเคฟเคตเคกเค• เคธเค‚เคšเคฏเคธเฅเคฅเคพเคจเคพเคค เคธเค‚เค—เฅเคฐเคนเคฟเคค เคนเฅ‹เคค เค†เคนเฅ‡"
 
@@ -2936,53 +2979,53 @@ msgstr "เคชเฅเคจเคฐเฅเคจเคพเคฎเคพเค‚เค•เคจ เค…เคฏเคถเคธเฅเคตเฅ€, %s (%s -> %s
 msgid "MD5Sum mismatch"
 msgstr "เคเคฎเคกเฅ€เฅซ เคฌเฅ‡เคฐเฅ€เคœ/MD5Sum เคœเฅเคณเคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "เคนเฅ…เคถ เคฌเฅ‡เคฐเฅ€เคœ เคœเฅเคณเคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (1) เคชเฅ…เค•เฅ‡เคœ เคซเคพเคˆเคฒ เคชเคพเคฐเฅเคธ เค•เคฐเคฃเฅเคฏเคพเคค เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "เคชเฅเคขเฅ€เคฒ เค•เคณ เค“เคณเค–เคšเคฟเคจเฅเคนเคพเค‚เคธเคพเค เฅ€ เคธเคพเคฐเฅเคตเคœเคจเคฟเค• เค•เคณ เค‰เคชเคฒเคฌเฅเคง เคจเคพเคนเฅ€:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2991,7 +3034,7 @@ msgstr ""
 "เคฎเฅ€ %s เคชเฅ…เค•เฅ‡เคœเค•เคฐเฅ€เคคเคพ เคธเค‚เคšเคฟเค•เคพ เคถเฅ‹เคงเคฃเฅเคฏเคพเคธ  เคธเคฎเคฐเฅเคฅ เคจเคตเฅเคนเคคเฅ‹. เคฏเคพเคšเคพ เค…เคฐเฅเคฅ เค…เคธเคพเค•เฅ€ เคคเฅเคฎเฅเคนเคพเคฒเคพ เคนเฅ‡ เคชเฅ…เค•เฅ‡เคœ เคธเฅเคตเคนเคธเฅเคคเฅ‡ "
 "เคธเฅเคฅเคฟเคฐ/เคจเคฟเคถเฅเคšเคฟเคค เค•เคฐเคฃเฅเคฏเคพเคšเฅ€ เค—เคฐเคœ เค†เคนเฅ‡(เคนเคฐเคตเคฒเฅ‡เคฒเฅเคฏเคพ เค†เคฐเฅเคšเคฎเฅเคณเฅ‡) "
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,7 +3043,7 @@ msgstr ""
 "เคฎเฅ€ %s เคชเฅ…เค•เฅ‡เคœเค•เคฐเฅ€เคคเคพ เคธเค‚เคšเคฟเค•เคพ เคถเฅ‹เคงเคฃเฅเคฏเคพเคธ  เคธเคฎเคฐเฅเคฅ เคจเคตเฅเคนเคคเฅ‹. เคฏเคพเคšเคพ เค…เคฐเฅเคฅ เค…เคธเคพเค•เฅ€ เคคเฅเคฎเฅเคนเคพเคฒเคพเคนเฅ‡ เคชเฅ…เค•เฅ‡เคœ เคธเฅเคตเคนเคธเฅเคคเฅ‡ "
 "เคธเฅเคฅเคฟเคฐ/เคจเคฟเคถเฅเคšเคฟเคค เค•เคฐเคฃเฅเคฏเคพเคšเฅ€ เค—เคฐเคœ เค†เคนเฅ‡."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3008,31 +3051,31 @@ msgstr ""
 "เคชเฅ…เค•เฅ‡เคœ เคฏเคพเคฆเฅ€เคšเฅ€/เคธเฅเคšเฅ€เคšเฅ€ เคธเค‚เคšเคฟเค•เคพ เคฆเฅ‚เคทเคฟเคค/เค–เคฐเคพเคฌ เคเคพเคฒเฅ‡เคฒเฅ€ เค†เคนเฅ‡. เคธเค‚เคšเคฟเค•เคพ เคจเคพเคต เคจเคพเคนเฅ€: เคชเฅ…เค•เฅ‡เคœเค•เคฐเฅ€เคคเคพ เค•เฅเคทเฅ‡เคคเฅเคฐ/"
 "เค เคฟเค•เคพเคฃ %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "เค†เค•เคพเคฐ เคœเฅเคณเคคเคจเคพเคนเฅ€"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "%s (1) เคชเฅ…เค•เฅ‡เคœ เคซเคพเคˆเคฒ เคชเคพเคฐเฅเคธ เค•เคฐเคฃเฅเคฏเคพเคค เค…เคธเคฎเคฐเฅเคฅ"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "เคฒเค•เฅเคทเคพเคค เค˜เฅเคฏเคพ,%s เคเคตเคœเฅ€ %s เคšเฅ€ เคจเคฟเคตเคก เค•เคฐเคค เค†เคนเฅ‡ \n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "%s เคกเคพเคฏเคตเฅเคนเคฐเฅเคœเคจ เคซเคพเคˆเคฒเคฎเคงเฅเคฏเฅ‡ เค…เคตเฅˆเคง เค“เคณ เค†เคนเฅ‡:"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "%s (1) เคชเฅ…เค•เฅ‡เคœ เคซเคพเคˆเคฒ เคชเคพเคฐเฅเคธ เค•เคฐเคฃเฅเคฏเคพเคค เค…เคธเคฎเคฐเฅเคฅ"
@@ -3060,7 +3103,7 @@ msgstr "เค“เคณเค–เคค เค†เคนเฅ‡.."
 msgid "Stored label: %s\n"
 msgstr "เค—เฅเคฐเคนเคฃ เค•เฅ‡เคฒเฅ‡เคฒเฅ‡ เคจเคพเคฎเคฆเคฐเฅเคถเค•: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "เคธเคฟเคกเฅ€-เคฐเฅ‰เคฎ เค…เคจเคฎเคพเค‰เค‚เคŸ เคนเฅ‹เคค เค†เคนเฅ‡...\n"
 
@@ -3122,30 +3165,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "เคชเฅ…เค•เฅ‡เคœ เคธเฅ‚เคšเฅ€เค‚เคšเฅเคฏเคพ เคชเฅเคฐเคคเฅ€ เคคเคฏเคพเคฐ เค•เคฐเคฟเคค เค†เคนเฅ‡..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "เคจเคตเคฟเคจ เคธเฅเคคเฅเคฐเฅ‹เคค เคธเฅ‚เคšเฅ€ เคฒเคฟเคนเคฟเคค เค†เคนเฅ‡\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "เคนเฅเคฏเคพ เคกเคฟเคธเฅเค•/เคšเค•เคคเฅ€ เค•เคฐเคฟเคคเคพ เคธเฅเคคเฅเคฐเฅ‹เคค เคธเฅ‚เคšเฅ€เคšเฅเคฏเคพ เคชเฅเคฐเคตเฅ‡เคถเคฟเค•เคพ เค†เคนเฅ‡เคค: \n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i เคฎเคพเคนเคฟเคคเฅ€เคธเค‚เคš เคฒเคฟเคนเคฟเคฒเฅ‡.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i เค—เคนเคพเคณ เคธเค‚เคšเคฟเค•เคพเคฌเคฐเฅ‹เคฌเคฐ %i เคฎเคพเคนเคฟเคคเฅ€ เคธเค‚เคš  เคฒเคฟเคนเคฟเคฒเฅ‡.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i เคตเคฟเคœเฅ‹เคก เคธเค‚เคšเคฟเค•เคพเค‚เคฌเคฐเฅ‹เคฌเคฐ %i เคฎเคพเคนเคฟเคคเฅ€ เคธเค‚เคš เคฒเคฟเคนเคฟเคฒเฅ‡\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i เค—เคนเคพเคณ เคธเค‚เคšเคฟเค•เคพเคฌเคฐเฅ‹เคฌเคฐ เค†เคฃเคฟ %i เคตเคฟเคœเฅ‹เคก เคธเค‚เคšเคฟเค•เคพเคฌเคฐเฅ‹เคฌเคฐ %i เคฎเคพเคนเคฟเคคเฅ€ เคธเค‚เคš เคฒเคฟเคนเคฟเคฒเฅ‡\n"
@@ -3160,17 +3203,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "เคนเฅ…เคถ เคฌเฅ‡เคฐเฅ€เคœ เคœเฅเคณเคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "เคธเค‚เคธเฅเคฅเคพเคชเคจ เค–เค‚เคกเคฟเคค เค•เคฐเคค เค†เคนเฅ‡."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3234,119 +3266,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เคนเฅ‹เคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s เคธเค‚เคฐเคšเคฟเคค เคนเฅ‹เคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s เค•เคพเคขเฅ‚เคจ เคŸเคพเค•เคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s เคธเค‚เคชเฅ‚เคฐเฅเคฃ เค•เคพเคขเฅ‚เคจ เคŸเคพเค•เคฒเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "เคธเค‚เคธเฅเคฅเคพเคชเคจเคพ-เคชเคถเฅเคšเคพเคค เคŸเฅเคฐเคฟเค—เคฐ %s เคšเคพเคฒเคตเคค เค†เคนเฅ‡"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' เคธเค‚เคšเคฏเคฟเค•เคพ เค—เคนเคพเคณ เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s เคซเคพเคˆเคฒ เค‰เค˜เคกเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s เคคเคฏเคพเคฐ เค•เคฐเคฟเคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s เคธเฅเคŸเฅ‡/เคฎเฅ‹เค•เคณเฅ‡ เค•เคฐเฅ€เคค เค†เคนเฅ‡ "
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s เคธเค‚เคฐเคšเคจเฅ‡ เคธเคพเค เฅ€ เคคเคฏเคพเคฐ เค•เคฐเคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s เคธเค‚เคธเฅเคฅเคพเคชเคฟเคค เคเคพเคฒเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s เคฒเคพ เค•เคพเคขเฅ‚เคจ เคŸเคพเค•เคฃเฅเคฏเคพเคธเคพเค เฅ€ เคคเคฏเคพเคฐเฅ€ เค•เคฐเคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s เค•เคพเคขเฅ‚เคจ เคŸเคพเค•เคฒเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s เคธเค‚เคชเฅ‚เคฐเฅเคฃ เค•เคพเคขเฅ‚เคจ เคŸเคพเค•เคฃเฅเคฏเคพเคšเฅ€ เคคเคฏเคพเคฐเฅ€ เค•เคฐเคค เค†เคนเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s เคธเค‚เคชเฅ‚เคฐเฅเคฃ เค•เคพเคขเฅ‚เคจ เคŸเคพเค•เคฒเฅ‡"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "เคธเคคเฅเคฐเคจเฅ‹เค‚เคฆ เคฒเคฟเคนเคฟเคคเคพ เคฏเฅ‡เคค เคจเคพเคนเฅ€, openpty() เค…เคธเคซเคฒ (/dev/pts เค†เคฐเฅ‹เคนเคฟเคค เคจเคพเคนเฅ€?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3358,13 +3390,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3394,14 +3420,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "%s:%s' (%i) เคฐเคฟเคเฅ‰เคฒเฅเคตเฅเคน เคนเฅ‹เคค เค…เคธเคคเคพเคจเคพ เค•เคพเคนเฅ€เคคเคฐเฅ€ เคตเคพเคˆเคŸ เค˜เคกเคฒเฅ‡"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... เคเคพเคฒเฅ‡"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "%s เคธเค‚เคฐเคšเคจเคพ เคซเคพเคˆเคฒ เค‰เค˜เคกเคค เค†เคนเฅ‡"
 
diff --git a/po/nb.po b/po/nb.po
index d5c2bb0f4..9cb8cb1b9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmรฅl <i18n-nb@lister.ping.uio.no>\n"
@@ -100,73 +100,73 @@ msgstr "Samlet mengde redegjort plass: "
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Du mรฅ oppgi minst ett sรธkemรธnster"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Klarer ikke รฅ finne pakken %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Lรฅste pakker:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pakke lรฅst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert pรฅ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,20 +241,28 @@ msgstr ""
 "  -o=? Sett en vilkรฅrlig innstilling, f.eks. -o dir::cache=/tmp\n"
 "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Oppgi et navn for disken, for eksempel ยซDebian 5.0.3 Disk 1ยป"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikke montere ยซ%sยป pรฅ ยซ%sยป"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
 
@@ -490,7 +498,7 @@ msgstr "Det er ikke mulig รฅ installere %s pรฅ nytt - den kan ikke nedlastes.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
@@ -599,8 +607,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -640,7 +648,7 @@ msgstr "Avbryter."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke รฅ skaffe %s  %s\n"
@@ -649,7 +657,7 @@ msgstr "Klarte ikke รฅ skaffe %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Klarte ikke laste ned alle filene"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullfรธrt med innstillinga ยซbare nedlastingยป"
 
@@ -733,7 +741,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Fรธlgende informasjon kan vรฆre til hjelp med รฅ lรธse problemet:"
 
@@ -783,7 +791,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prรธv ยซapt-get -f installยป uten pakker (eller "
 "angi en lรธsning)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -795,78 +803,78 @@ msgstr ""
 "at visse kjernepakker ennรฅ ikke er laget eller flyttet ut av ยซIncomingยป for\n"
 "distribusjonen."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ร˜delagte pakker"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Fรธlgende ekstra pakker vil bli installert."
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Foreslรฅtte pakker:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke รฅ finne pakken %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Utfรธrt"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemlรธser รธdela noe"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke รฅ lรฅse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du mรฅ angi minst en pakke du vil ha kildekoden til"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke รฅ finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -875,7 +883,7 @@ msgstr ""
 "MERK: ยซ%sยป-pakker blir vedlikeholdt i versjonskontrollsystemet ยซ%sยป pรฅ:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -886,106 +894,106 @@ msgstr ""
 "bzr get %s\n"
 "for รฅ hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil ยซ%sยป\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger รฅ skaffe %sB av %sB fra kildekodearkivet.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger รฅ skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke รฅ skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omgรฅr utpakking av allerede utpakket kilde i %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen ยซ%sยป mislyktes.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Sjekk om pakken ยซdpkg-devยป er installert.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen ยซ%sยป mislyktes.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du mรฅ angi minst en pakke du vil sjekke ยซbuilddepsยป for"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarer ikke รฅ skaffe informasjon om bygge-avhengighetene for %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikke รฅ tilfredsstille %s avhengighet for %s: den installerte pakken "
 "%s er for ny"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -994,37 +1002,37 @@ msgstr ""
 "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
 "versjoner av pakken %s som oppfyller versjonskravene"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke รฅ tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke รฅ tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke รฅ behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Stรธttede moduler:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1113,7 +1121,7 @@ msgstr ""
 "for mer informasjon og flere valg.\n"
 "                       Denne APT har kraften til en Superku.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1188,7 +1196,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet pรฅ %s, men den ble ikke funnet"
@@ -1328,8 +1337,8 @@ msgstr "Tidsavbrudd pรฅ forbindelsen"
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1342,8 +1351,8 @@ msgid "Protocol corruption"
 msgstr "Protokollรธdeleggelse"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Skrivefeil"
 
@@ -1397,7 +1406,7 @@ msgstr "Tidsavbrudd pรฅ tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke รฅ godta tilkoblingen"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nรธkkel for fil"
 
@@ -1424,86 +1433,99 @@ msgstr "Spรธrring"
 msgid "Unable to invoke "
 msgstr "Klarte ikke รฅ starte"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Klarte ikke รฅ opprette en sokkel for %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikke รฅ starte forbindelsen til %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Klarte ikke รฅ koble til %s:%s (%s), tidsavbrudd pรฅ forbindelsen"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikke รฅ koble til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kobler til %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikke รฅ slรฅ opp ยซ%sยป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig feil ved oppslag av ยซ%sยป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Noe galt skjedde ved oppslag av ยซ%s:%sยป (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Noe galt skjedde ved oppslag av ยซ%s:%sยป (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikke koble til %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme nรธkkelfingeravtrykk?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Klarte ikke kjรธre ยซgpgvยป for รฅ verifisere signaturen (er gpgv installert?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kjรธring av gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "De fรธlgende signaturene var ugyldige:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1543,53 +1565,53 @@ msgstr "Denne HTTP-tjeneren har รธdelagt stรธtte for omrรฅde"
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Tidsavbrudd pรฅ forbindelsen"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ร˜delagte hodedata"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Intern feil"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke รฅ lese %s"
@@ -1616,7 +1638,12 @@ msgstr "Ingen speilfil ยซ%sยป funnet"
 msgid "Can not read mirror file '%s'"
 msgstr "Ingen speilfil ยซ%sยป funnet"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Ingen speilfil ยซ%sยป funnet"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
@@ -1714,7 +1741,7 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkรฅrlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan ikke skrive til %s"
@@ -1861,8 +1888,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikke รฅ รฅpne Databasefila %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikke รฅ fรฅ statusen pรฅ %s"
@@ -1875,87 +1902,87 @@ msgstr "Arkivet har ingen kontrollpost"
 msgid "Unable to get a cursor"
 msgstr "Klarte ikke รฅ finne en peker"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Klarte ikke รฅ lese katalogen %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Klarte ikke รฅ fรฅ statusen pรฅ %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "F:"
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A:"
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "F: Det er feil ved fila"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Klarte ikke รฅ slรฅ opp %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Klarte ikke รฅ finne fram i treet"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Klarte ikke รฅ รฅpne %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikke รฅ lese lenken %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Klarte ikke รฅ oppheve lenken %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikke รฅ lenke %s til %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa pรฅ %s B er nรฅdd.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arkivet har ikke noe pakkefelt"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen overstyringsoppfรธring\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " %s-vedlikeholderen er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen kildeoverstyringsoppfรธring\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har ingen binรฆroverstyringsoppfรธring heller\n"
@@ -2029,7 +2056,7 @@ msgstr "Klarte ikke รฅ lese under utregning av MD5"
 msgid "Problem unlinking %s"
 msgstr "Problem ved oppheving av lenken til %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikke รฅ endre navnet pรฅ %s til %s"
@@ -2088,23 +2115,23 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkรฅrlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Klarte ikke รฅ opprette rรธr"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Klarte ikke รฅ kjรธre gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ร˜delagt arkiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislykkes, arkivet er รธdelagt"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjent TAR-hode: type %u, medlem %s"
@@ -2175,54 +2202,54 @@ msgstr "Klarte ikke รฅ skrive fila %s"
 msgid "Failed to close file %s"
 msgstr "Klarte ikke รฅ lukke fila %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stien %s er for lang"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakker ut %s mer enn en gang"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s er avledet"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakken prรธver รฅ skrive til avledningsmรฅlet %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Avledningsstien er for lang"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fant ikke knutepunktet i dens hash-spann"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Stien er for lang"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriver over pakketreff uten versjon for %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikke รฅ fรฅ statusen pรฅ %s"
@@ -2306,30 +2333,30 @@ msgstr ""
 "av brukeren."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lit %lim %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lit %lim %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%lim %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
@@ -2399,6 +2426,16 @@ msgstr "%c%s ... Feil"
 msgid "%c%s... Done"
 msgstr "%c%s ... Ferdig"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2459,114 +2496,120 @@ msgstr "Klarer ikke รฅ fรฅ statusen pรฅ CD-spilleren"
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved lรฅsing av gzip-fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Bruker ikke lรฅsing for den skrivebeskyttede lรฅsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikke รฅpne lรฅsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Bruker ikke lรฅsing pรฅ den nfs-monterte lรฅsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Fรฅr ikke lรฅst %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok signalet %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikke รฅpne fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikke รฅpne fildeskriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikke รฅ opprette underprosessen IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Klarte ikke รฅ kjรธre komprimeringen"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lese, har fremdeles %lu igjen รฅ lese, men ingen igjen"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har fremdeles %lu igjen รฅ skrive, men klarte ikke รฅ"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved lรฅsing av fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved endring av navn pรฅ fila %s til %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenke til fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nรธkkelring installert i %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
@@ -2593,59 +2636,59 @@ msgstr "Denne APT stรธtter ikke versjonssystemet ยซ%sยป"
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Avhenger av"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Forutsetter"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Foreslรฅr"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Er i konflikt med"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Nuller"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ร˜delegger"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Forbedrer"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "pรฅkrevet"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "vanlig"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "valgfri"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "tillegg"
 
@@ -2745,17 +2788,17 @@ msgstr "ร…pner %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linje %u i kildelista %s er for lang"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Feil pรฅ %u i kildelista %s (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen ยซ%sยป er ukjent i linje %u i kildelista %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2764,12 +2807,12 @@ msgstr ""
 "Klarte ikke gjennomfรธre umiddelbar konfigurasjon av ยซ%sยป. Se man 5 apt.conf "
 "under APT::Immediate-Configure for detaljer. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Klarte ikke รฅpne fila ยซ%sยป"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2792,7 +2835,7 @@ msgid ""
 msgstr ""
 "Pakka %s trenger รฅ installeres pรฅ nytt, men jeg finner ikke lageret for den."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2800,11 +2843,11 @@ msgstr ""
 "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
 "som holdes tilbake."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke รฅ rette problemene, noen รธdelagte pakker er holdt tilbake."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2813,7 +2856,7 @@ msgstr ""
 "Klarte ikke รฅ laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
 "ble brukt isteden. "
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listemappa %spartial mangler."
@@ -2850,17 +2893,17 @@ msgstr "Finner ikke metode-driveren %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Sett inn disken merket ยซ%sยป i lagringsenheten ยซ%sยป og trykk Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet ยซ%sยป stรธttes ikke"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
@@ -2915,14 +2958,14 @@ msgstr "Lageret har et uoverensstemmende versjonssystem"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Feil oppsto under behandling av %s (FindPkg)"
@@ -2943,26 +2986,26 @@ msgstr "Jรธss, du har overgรฅtt antallet beskrivelser denne APT klarer."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jรธss, du har overgรฅtt antallet avhengighetsforhold denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Leser pakkelister"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Samler inn filtilbud"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO-feil ved lagring av kildekode-lager"
 
@@ -2975,56 +3018,56 @@ msgstr "klarte ikke รฅ endre navnet, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5sum"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarer ikke รฅ fortolke Release-fila %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Det er ingen offentlig nรธkkel tilgjengelig for de fรธlgende nรธkkel-ID-ene:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den "
 "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3033,7 +3076,7 @@ msgstr ""
 "Klarte ikke รฅ finne en fil for pakken %s. Det kan bety at du mรฅ ordne pakken "
 "selv (fordi arkitekturen mangler)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3042,37 +3085,37 @@ msgstr ""
 "Klarte ikke รฅ finne en fil for pakken %s. Det kan bety at du mรฅ ordne denne "
 "pakken selv."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Oversiktsfilene er รธdelagte. Feltet ยซFilename:ยป mangler for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Feil stรธrrelse"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarer ikke รฅ fortolke Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ingen avsnitt i Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ingen sjekksumoppfรธring i Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ugyldig ยซValid-Untilยป-oppfรธring i Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ugyldig ยซDateยป-oppfรธring i Release-fila %s"
@@ -3100,7 +3143,7 @@ msgstr "Indentifiserer.."
 msgid "Stored label: %s\n"
 msgstr "Lagret merkelapp: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Avmonterer CD-ROM ...\n"
 
@@ -3164,30 +3207,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Skriver ny kildeliste\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Kildelisteoppfรธringer for denne CD-en er:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i feile filer.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
@@ -3202,17 +3245,6 @@ msgstr "Klarte ikke finne autentiseringsoppfรธring for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsummen stemmer ikke for: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nรธkkelring installert i %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3283,113 +3315,113 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Legger merke til at %s forsvinner"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kjรธrer etter-installasjonsutlรธser %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa ยซ%sยป mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke รฅpne fila ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder รฅ fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Kjรธrer dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nรฅdd"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "avhengighetsproblemer - lar den vรฆre uoppsatt"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3397,7 +3429,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
 "fรธlgefeil fra en tidligere feil."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3413,13 +3445,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en ยซtom for "
 "minneยป-feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3450,21 +3476,6 @@ msgstr "dpkg ble avbrutt. Du mรฅ kjรธre ยซ%sยป manuelt for รฅ rette problemet,"
 msgid "Not locked"
 msgstr "Ikke lรฅst"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Noe galt skjedde ved oppslag av ยซ%s:%sยป (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s ... Ferdig"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og "
-#~ "den forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Hopper over den ikke-eksisterende fila %s"
 
diff --git a/po/ne.po b/po/ne.po
index 1b10232fa..d8f863c28 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -98,73 +98,73 @@ msgstr "เค•เฅ‹ เคฒเคพเค—เคฟ เค•เฅ‚เคฒ เค–เคพเคฒเฅ€ เค เคพเคŠเค เคฒเฅ‡เค–เคพเค‚เ
 msgid "Package file %s is out of sync."
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเค‡เคฒ %s sync เคญเคจเฅเคฆเคพ เคฌเคพเคนเคฟเคฐ เค› เฅค"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "เค•เฅเคจเฅˆ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚ เคซเฅ‡เคฒเคพ เคชเคฐเฅ‡เคจ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "เคคเคชเคพเคˆเคเคฒเฅ‡ เคเค‰เคŸเคพ เคตเคพเคธเฅเคคเคตเคฟเค• เคฌเคพเคจเฅเค•เฅ€ เคฆเคฟเคจเฅเคชเคฐเฅเค›"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ %s เคคเฅ‹เค•เฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเค‡เคฒเคนเคฐเฅ‚:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "เค•เฅเคฏเคพเคธ sync  เคญเคจเฅเคฆเคพ เคฌเคพเคนเคฟเคฐ เค›, เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเค‡เคฒ x-ref เค—เคฐเฅเคจ เคธเค•เฅเคฆเฅˆเคจ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "เคชเคฟเคจ เค—เคฐเคฟเคเค•เคพ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(เคซเฅ‡เคฒเคพ เคชเคฐเฅ‡เคจ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  เคธเฅเคฅเคพเคชเคจเคพ เคญเคฏเฅ‹:"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  เค‰เคฎเฅ‡เคฆเฅเคตเคพเคฐ:"
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(เค•เฅเคจเฅˆ เคชเคจเคฟ เคนเฅ‹เค‡เคจ)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคชเคฟเคจ:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  เคธเค‚เคธเฅเค•เคฐเคฃ เคคเคพเคฒเคฟเค•เคพ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s เค•เฅ‹ เคฒเคพเค—เคฟ %s %s, %s %s เคฎเคพ เค•เคฎเฅเคชเคพเคเคฒ เค—เคฐเคฟเคเค•เฅ‹ เค›\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,21 +238,29 @@ msgstr ""
 "  -o=? เคเค‰เคŸเคพ เคธเฅเคตเฅ‡เคšเฅเค›เคพเคšเคพเคฐเฅ€ เค•เคจเคซเคฟเค—เคฐเฅ‡เคธเคจ เคซเคพเค‡เคฒ เคธเฅ‡เคŸ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ, เคœเคธเฅเคคเฅˆ -o dir::cache=/tmp\n"
 "เคงเฅ‡เคฐเฅˆ เคœเคพเคจเค•เคพเคฐเฅ€เค•เฅ‹เคช เคฒเคพเค—เคฟ apt-cache(8) เคฐ apt.conf(5) เคฎเฅเคฏเคพเคจเฅเคฒ เคชเฅƒเคทเฅเคŸเคนเคฐเฅ‚ เคนเฅ‡เคฐเฅเคจเฅเคนเฅ‹เคธเฅ  เฅค\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "เค•เฅƒเคชเคฏเคพ เคฏเฅ‹ เคกเคฟเคธเฅเค•เค•เฅ‹ เคฒเคพเค—เคฟ เคจเคพเคฎ เค‰เคชเคฒเคฌเฅเคง เค—เคฐเคพเค‰เคจเฅเคนเฅ‹เคธเฅ, เคœเคธเฅเคคเฅˆ 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "เค•เฅƒเคชเคฏเคพ เคกเฅเคฐเคพเค‡เคญเคฎเคพ เคกเคฟเคธเฅเค• เค˜เฅเคธเคพเค‰เคจเฅเคนเฅ‹เคธเฅ เคฐ เค‡เคจเฅเคŸเคฐ เคฅเคฟเคšเฅเคจเฅเคนเฅ‹เคธเฅ"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr " %s เคฎเคพ  %s  เคชเฅเคจ:เคจเคพเคฎเค•เคฐเคฃ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "เคคเคชเคพเคˆเคเค•เฅ‹ เคธเฅ‡เคŸเคฎเคพ เคฌเคพเคเค•เฅ€ เคธเคฟ เคกเคฟ เคนเคฐเฅเค•เฅ‹ เคฒเคพเค—เคฟ เคฏเฅ‹ เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เคซเฅ‡เคฐเฅ€ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ เฅค "
 
@@ -486,7 +494,7 @@ msgstr " %s เค•เฅ‹ เคชเฅเคจ: เคธเฅเคฅเคพเคชเคจเคพ เคธเคฎเฅเคญเคต เค›เฅˆเคจ, เ
 msgid "%s is already the newest version.\n"
 msgstr "%s เคชเคนเคฟเคฒเฅเคฏเฅˆ เคจเคฏเคพเค เคธเค‚เคธเฅเค•เคฐเคฃ เคนเฅ‹ เฅค\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "เคคเคฐ %s เคธเฅเคฅเคพเคชเคจเคพ เคนเฅเคจเฅเคชเคฐเฅเคฏเฅ‹"
@@ -593,8 +601,8 @@ msgstr "เค…เคจเคชเฅเคฏเคพเค• เค—เคฐเคฟเคธเค•เฅ‡ เคชเค›เคฟ เคฅเคช เคกเคฟเคธเฅเค
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB เค…เคจเคชเฅเคฏเคพเค• เค—เคฐเคฟเคธเค•เฅ‡ เคชเค›เคฟ เคกเคฟเคธเฅเค• เค–เคพเคฒเฅ€ เค เคพเค‰เค เค–เคพเคฒเฅ€ เคนเฅเคจเฅ‡เค› เฅค\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s เคฎเคพ เค–เคพเคฒเฅ€ เค เคพเคŠเค เคจเคฟเคฐเฅเคงเคพเคฐเคฃ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ"
@@ -633,7 +641,7 @@ msgstr "เคชเคฐเคฟเคคเฅเคฏเคพเค— เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ เฅค"
 msgid "Do you want to continue [Y/n]? "
 msgstr "เค•เฅ‡ เคคเคชเคพเคˆเค เคจเคฟเคฐเคจเฅเคคเคฐเคคเคพ เคฆเคฟเคจ เคšเคพเคนเคจเฅเคนเฅเคจเฅเค› [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s เคคเคพเคจเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹\n"
@@ -642,7 +650,7 @@ msgstr "%s  %s เคคเคพเคจเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹\n"
 msgid "Some files failed to download"
 msgstr "เค•เฅ‡เคนเฅ€ เคซเคพเค‡เคฒเคนเคฐเฅ‚ เคกเคพเค‰เคจเคฒเฅ‹เคก เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "เคกเคพเค‰เคจเคฒเฅ‹เคก เคธเคฎเคพเคชเฅเคค เคญเคฏเฅ‹ เคฐ เคกเคพเค‰เคจเคฒเฅ‹เคกเคฎเคพ เคฎเฅ‹เคก เคฎเคพเคคเฅเคฐเฅˆ เค›"
 
@@ -720,7 +728,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "เคจเคฟเคฎเฅเคจ เคธเฅ‚เคšเคจเคพเคฒเฅ‡ เค…เคตเคธเฅเคฅเคพเคฒเคพเคˆ เคนเคฒ เค—เคฐเฅเคจ เคฎเคฆเฅเคฆเคค เค—เคฐเฅเคจเฅ‡เค›: "
 
@@ -769,7 +777,7 @@ msgstr ""
 "เคจเคญเฅ‡เคŸเคฟเคเค•เคพ เคจเคฟเคฐเฅเคญเคฐเคคเคพเคนเคฐเฅ‚ เฅค เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚ เคฌเคฟเคจเคพ 'apt-get -f install' เคชเฅเคฐเคฏเคพเคธ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ ( เคตเคพ "
 "เคธเคฎเคพเคงเคพเคจ เคจเคฟเคฐเฅเคฆเคฟเคทเฅเคŸ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ) เฅค"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -782,85 +790,85 @@ msgstr ""
 " เคตเคฟเคคเคฐเคฃ เค…เคนเคฟเคฒเฅ‡ เคธเคฎเฅเคฎ เคธเคฟเคฐเฅเคœเคจเคพ\n"
 " เคญเคเค•เฅ‹ เค›เฅˆเคจ เคตเคพ เค†เคตเค—เคฎเคจ เคตเคฟเคจเคพเคจเฅˆ เคธเคฐเฅเคฏเฅ‹ เฅค"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "เคญเคพเคเคšเคฟเคเค•เคพ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "เคจเคฟเคฎเฅเคจ เค…เคคเคฟเคฐเคฟเค•เฅเคค เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚ เคธเฅเคฅเคพเคชเคจเคพ เคนเฅเคจเฅ‡เค›เคจเฅ:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "เคธเฅเคเคพเคต เคฆเคฟเคเค•เคพ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "เคธเคฟเคซเคพเคฐเคฟเคธ เค—เคฐเคฟเคเค•เคพ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ‚:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค•เคฟเคเคจ  %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "เคคเคฐ %s เคธเฅเคฅเคพเคชเคจเคพ เคนเฅเคจเฅเคชเคฐเฅเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "เคธเฅเคคเคฐ เคตเฅƒเคฆเฅเคงเคฟ เค—เคฃเคจเคพ เค—เคฐเคฟเคฆเฅˆเค›..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "เค•เคพเคฎ เคญเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เค†เคจเฅเคคเคฐเคฟเค• เคคเฅเคฐเฅเคŸเคฟ,เคธเคฎเคธเฅเคฏเคพ เคนเคฒเค•เคฐเฅเคคเคพเคฒเฅ‡ เค‰เคคเฅเคคเคฎ เค—เฅเคฃ เคญเคพเคเคšเฅเคฏเฅ‹ "
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "เคกเคพเค‰เคจเคฒเฅ‹เคก เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ เคคเคพเคฒเฅเคšเคพ เคฎเคพเคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "เค•เฅ‹ เคฒเคพเค—เคฟ เคธเฅเคฐเฅ‹เคค เคคเคพเคจเฅเคจ เค•เคฎเฅเคคเคฟเคฎเคพ เคเค‰เคŸเคพ เคชเฅเคฏเคพเค•เฅ‡เคœ เคจเคฟเคฐเฅเคฆเคฟเคทเฅเคŸ เค—เคฐเฅเคจเฅเคชเคฐเฅเค›"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ เคธเฅเคฐเฅ‹เคค เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -868,104 +876,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "เคชเคนเคฟเคฒเฅเคฏเฅˆ เคกเคพเค‰เคจเคฒเฅ‹เคก เคญเคเค•เคพ เคซเคพเค‡เคฒเคนเคฐเฅ เคซเคกเฅเค•เคพเค‡เคฆเฅˆเค› '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "เคคเคชเคพเคˆเค เคธเค‚เค— %s เคฎเคพ เคชเคฐเฅเคฏเคพเคชเฅเคค เค–เคพเคฒเฅ€ เค เคพเคŠเค เค›เฅˆเคจ"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "เคธเฅเคฐเฅ‹เคค เคธเค‚เค—เฅเคฐเคนเคนเคฐเฅเค•เฅ‹ %sB/%sB เคชเฅเคฐเคพเคชเฅเคค เค—เคฐเฅเคจ เค†เคตเคถเฅเคฏเค• เค› เฅค\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "เคธเฅเคฐเฅ‹เคค เคธเค‚เค—เฅเคฐเคนเคนเคฐเฅเค•เฅ‹ %sB เคชเฅเคฐเคพเคชเฅเคค เค—เคฐเฅเคจ เค†เคตเคถเฅเคฏเค• เค› เฅค\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "เคธเฅเคฐเฅ‹เคค เคซเคกเฅเค•เคพเค‰เคจเฅเคนเฅ‹เคธเฅ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "เค•เฅ‡เคนเฅ€ เคธเค‚เค—เฅเคฐเคน เคซเคกเฅเค•เคพเค‰เคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹ เฅค"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s เคฎเคพ เคชเคนเคฟเคฒเฅเคฏเฅˆ เค…เคจเคชเฅเคฏเคพเค• เค—เคฐเคฟเคเค•เคพ เคธเฅเคฐเฅ‹เคคเค•เฅ‹ เค…เคจเคชเฅเคฏเคพเค• เคซเคกเฅเค•เคพเค‡เคฆเฅˆเค›\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "เค…เคจเคชเฅเคฏเคพเค• เค†เคฆเฅ‡เคถ '%s' เค…เคธเคซเคฒ เคญเคฏเฅ‹ เฅค\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "เคœเคพเคเคšเฅเคจเฅเคนเฅ‹เคธเฅ เคฏเคฆเคฟ 'dpkg-dev' เคชเฅเคฏเคพเค•เฅ‡เคœ เคธเฅเคฅเคพเคชเคจเคพ เคญเคฏเฅ‹ เฅค\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "เคจเคฟเคฐเฅเคฎเคพเคฃ เค†เคฆเฅ‡เคถ '%s' เค…เคธเคซเคฒ เคญเคฏเฅ‹ เฅค\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "เคถเคพเค–เคพ เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "เค•เฅ‹ เคฒเคพเค—เคฟ builddeps เคœเคพเคเคšเฅเคจ เค•เคฎเฅเคคเคฟเคฎเคพ เคเค‰เคŸเคพ เคชเฅเคฏเคพเค•เฅ‡เคœ เคจเคฟเคฐเฅเคฆเคทเฅเคŸ เค—เคฐเฅเคจเฅเคชเคฐเฅเค›"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ เคจเคฟเคฐเฅเคฎเคพเคฃ-เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเฅ‚เคšเคจเคพ เคชเฅเคฐเคพเคชเฅเคค เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s เค•เฅเคจเฅˆ เคจเคฟเคฐเฅเคฎเคพเคฃเคฎเคพ เค†เคงเคพเคฐเคฟเคค เคนเฅเคฆเฅˆเคจ เฅค\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ %s เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเคจเฅเคคเฅเคทเฅเคŸ เคนเฅเคจ เคธเค•เฅ‡เคจ เค•เคฟเคจเคญเคจเฅ‡ เคชเฅเคฏเคพเค•เฅ‡เคœ %s เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ %s เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเคจเฅเคคเฅเคทเฅเคŸ เคนเฅเคจ เคธเค•เฅ‡เคจ เค•เคฟเคจเคญเคจเฅ‡ เคชเฅเคฏเคพเค•เฅ‡เคœ %s เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ %s เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเคจเฅเคคเฅเคทเฅเคŸ เคชเคพเคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹: เคธเฅเคฅเคพเคชเคฟเคค เคชเฅเคฏเคพเค•เฅ‡เคœ %s เค…เคคเคฟ เคจเคฏเคพเค เค›"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -974,37 +982,37 @@ msgstr ""
 "%sเค•เฅ‹ เคฒเคพเค—เคฟ %s เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเคจเฅเคคเฅเคทเฅเคŸ เคนเฅเคจ เคธเค•เฅ‡เคจ เค•เคฟเคจ เคญเคจเฅ‡ เคชเฅเคฏเคพเค•เฅ‡เคœ %s เค•เฅ‹ เค•เฅเคจเฅˆ เค‰เคชเคฒเคฌเฅเคง เคธเค‚เคธเฅเค•เคฐเคฃเคฒเฅ‡ เคธเค‚เคธเฅเค•เคฐเคฃ "
 "เค†เคตเคถเฅเคฏเค•เคคเคพเคนเคฐเฅเคฒเคพเคˆ เคธเคจเฅเคคเฅเคทเฅเคŸ เคชเคพเคฐเฅเคจ เคธเค•เฅ‡เคจ "
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ %s เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเคจเฅเคคเฅเคทเฅเคŸ เคนเฅเคจ เคธเค•เฅ‡เคจ เค•เคฟเคจเคญเคจเฅ‡ เคชเฅเคฏเคพเค•เฅ‡เคœ %s เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ %s เคจเคฟเคฐเฅเคญเคฐเคคเคพ เคธเคจเฅเคคเฅเคทเฅเคŸ เค—เคฐเฅเคจ เค…เคธเคซเคฒ: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ เคจเคฟเคฐเฅเคฎเคพเคฃ เคจเคฟเคฐเฅเคญเคฐเคคเคพเคนเคฐเฅ‚ เคธเคจเฅเคคเฅเคทเฅเคŸ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ เฅค "
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "เคจเคฟเคฐเฅเคฎเคพเคฃ เคจเคฟเคฐเฅเคญเคฐเคคเคพเคนเคฐเฅ‚ เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค—เคฐเฅเคจ เค…เคธเคซเคฒ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) เคฎเคพ เคœเคกเคพเคจ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "เคธเคฎเคฐเฅเคฅเคฟเคค เคฎเฅ‹เคกเฅเคฏเฅเคฒเคนเคฐเฅ‚:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1089,7 +1097,7 @@ msgstr ""
 "pages เคนเฅ‡เคฐเฅเคจเฅเคนเฅ‹เคธเฅ เฅค\n"
 "                       APT เคธเค‚เค— เคธเฅเคชเคฐ เค•เคพเค‰ เคถเค•เฅเคคเคฟเคนเคฐเฅ‚ เค› เฅค\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1160,7 +1168,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s เคชเคนเคฟเคฒเฅเคฏเฅˆ เคจเคฏเคพเค เคธเค‚เคธเฅเค•เคฐเคฃ เคนเฅ‹ เฅค\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s เค•เฅ‹ เคฒเคพเค—เคฟ เคชเคฐเฅเค–เคฟเคฐเคนเฅ‡เค•เฅ‹ เคคเคฐ เคฏเฅ‹ เคคเฅเคฏเคนเคพเค เค›เฅˆเคจ"
@@ -1298,8 +1307,8 @@ msgstr "เคœเคกเคพเคจ เคธเคฎเคฏ เคธเค•เคฟเคฏเฅ‹"
 msgid "Server closed the connection"
 msgstr "เคธเคฐเฅเคญเคฐเคฒเฅ‡ เคœเคกเคพเคจ เคฌเคจเฅเคฆ เค—เคฐเฅเคฏเฅ‹"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "เคคเฅเคฐเฅเคŸเคฟ เคชเคขเฅเคจเฅเคนเฅ‹เคธเฅ"
 
@@ -1312,8 +1321,8 @@ msgid "Protocol corruption"
 msgstr "เคชเฅเคฐเฅ‹เคŸเฅ‹เค•เคฒ เคฆเฅ‚เคทเคฟเคค"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "เคคเฅเคฐเฅเคŸเคฟ เคฒเฅ‡เค–เฅเคจเฅเคนเฅ‹เคธเฅ"
 
@@ -1367,7 +1376,7 @@ msgstr "เคกเฅ‡เคŸเคพ เคธเค•เฅ‡เคŸเค•เฅ‹ เคœเคกเคพเคจ เคธเคฎเคฏ เคธเค•เคฟเคฏเฅ‹"
 msgid "Unable to accept connection"
 msgstr "เคœเคกเคพเคจ เคธเฅเคตเฅ€เค•เคพเคฐ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "เคธเคฎเคธเฅเคฏเคพ เคฆเฅเคฐเฅเคคเคพเคจเฅเคตเฅ‡เคทเคฃ เคซเคพเค‡เคฒ"
 
@@ -1394,86 +1403,99 @@ msgstr "เค•เฅเคตเฅ‡เคฐเฅ€"
 msgid "Unable to invoke "
 msgstr "เค†เคนเฅเคตเคพเคจ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) เคฎเคพ เคœเคกเคพเคจ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) เค•เฅ‹ เคฒเคพเค—เคฟ เคธเค•เฅ‡เคŸ เคธเคฟเคฐเฅเคœเคจเคพ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr " %s:%s (%s) เคฎเคพ เคœเคกเคพเคจ เคธเฅเคฐเฅเคตเคพเคค เค—เคฐเฅเคจ เคธเค•เฅ‡เคจ"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) เคฎเคพ เคœเคกเคพเคจ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ, เคœเคกเคพเคจ เคธเคฎเคฏ เคธเค•เคฟเคฏเฅ‹"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr " %s:%s (%s) เคฎเคพ เคœเคกเคพเคจ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ เฅค"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s เคฎเคพ เคœเคกเคพเคจ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s' เคนเคฒ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' เคนเคฒ เค—เคฐเฅเคฆเคพ เค…เคธเฅเคฅเคพเคฏเฅ€ เค…เคธเคซเคฒ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr " '%s:%s' (%i) เคนเคฒ เค—เคฐเฅเคฆเคพ เค•เฅ‡เคนเฅ€ เคฆเฅเคทเฅเคŸ เค˜เคŸเฅเคฏเฅ‹"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr " '%s:%s' (%i) เคนเคฒ เค—เคฐเฅเคฆเคพ เค•เฅ‡เคนเฅ€ เคฆเฅเคทเฅเคŸ เค˜เคŸเฅเคฏเฅ‹"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s เคฎเคพ เคœเคกเคพเคจ เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "เค†เคจเฅเคคเคฐเคฟเค• เคคเฅเคฐเฅเคŸเคฟ: เค…เคธเคฒ เคนเคธเฅเคคเคพเค•เฅเคทเคฐ, เคคเคฐ เค•เฅเคžเฅเคœเฅ€ เค”เค เคพเค›เคพเคช เคจเคฟเคฐเฅเคงเคพเคฐเคฃ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "เค•เคฎเฅเคคเคฟเคฎเคพ เคเค‰เคŸเคพ เค…เคตเฅˆเคง เคนเคธเฅเคคเคพเค•เฅเคทเคฐ เคตเคฟเคฐเฅ‹เคง เคญเคฏเฅ‹ เฅค"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "เคนเคธเฅเคคเคพเค•เฅเคทเคฐ เคฐเฅ‚เคœเฅ‚ เค—เคฐเฅเคจ '%s' เค•เคพเคฐเฅเคฏเคจเฅเคตเคฏเคจ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ (เค•เฅ‡ gpgv เคธเฅเคฅเคพเคชเคจเคพ เคญเคฏเฅ‹?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "gpgv เค•เคพเคฐเฅเคฏเคจเฅเคตเคฏเคจ เค—เคฐเฅเคฆเคพ เค…เคœเฅเคžเคพเคค เคคเฅเคฐเฅเคŸเคฟ"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "เคจเคฟเคฎเฅเคจ เคนเคธเฅเคคเคพเค•เฅเคทเคฐเคนเคฐเฅ‚ เค…เคตเฅˆเคง เค›เคจเฅ:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1511,53 +1533,53 @@ msgstr "HTTP เคธเคฐเฅเคญเคฐ เคธเค‚เค— เคญเคพเคเคšเคฟเคเค•เฅ‹ เคฆเคพเคฏเคฐเคพ
 msgid "Unknown date format"
 msgstr "เค…เคœเฅเคžเคพเคค เคฎเคฟเคคเคฟ เคขเคพเคเคšเคพ"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "เค…เคธเคซเคฒ เคšเคฏเคจ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "เคœเคกเคพเคจ เคธเคฎเคฏ เคธเค•เคฟเคฏเฅ‹"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "เคจเคฟเคฐเฅเค—เคพเคค เคซเคพเค‡เคฒเคฎเคพ เคคเฅเคฐเฅเคŸเคฟ เคฒเฅ‡เค–เคฟเคฆเฅˆเค›"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "เคซเคพเค‡เคฒเคฎเคพ เคคเฅเคฐเฅเคŸเคฟ เคฒเฅ‡เค–เคฟเคฆเฅˆเค›"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "เคซเคพเค‡เคฒเคฎเคพ เคคเฅเคฐเฅเคŸเคฟ เคฒเฅ‡เค–เคฟเคฆเฅˆเค›"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เคธเคฐเฅเคญเคฐเคฌเคพเคŸ เคคเฅเคฐเฅเคŸเคฟ เคชเคขเคฟเคฆเฅˆเค› เฅค เคฆเฅ‚เคฐ เค—เคจเฅเคคเคฌเฅเคฏ เคฌเคจเฅเคฆ เคœเคกเคพเคจ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "เคธเคฐเฅเคญเคฐเคฌเคพเคŸ เคคเฅเคฐเฅเคŸเคฟ เคชเคขเคฟเคฆเฅˆเค›"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "เค–เคฐเคพเคฌ เคนเฅ‡เคกเคฐ เคกเฅ‡เคŸเคพ"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "เคœเคกเคพเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "เค†เคจเฅเคคเคฐเคฟเค• เคคเฅเคฐเฅเคŸเคฟ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s เคชเคขเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
@@ -1584,7 +1606,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "เคซเคพเค‡เคฒ %s เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "เคซเคพเค‡เคฒ %s เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1678,7 +1705,7 @@ msgstr ""
 "  -c=? เคฏเฅ‹ เค•เคจเคซเคฟเค—เคฐเฅ‡เคธเคจ เคซเคพเค‡เคฒ เคชเคขเฅเคจเฅเคนเฅ‹เคธเฅ\n"
 "  -o=? เคเค‰เคŸเคพ เคธเฅเคตเฅ‡เคšเฅเค›เคพเคšเคพเคฐเฅ€ เค•เคจเคซเคฟเค—เคฐเฅ‡เคธเคจ เคตเคฟเค•เคฒเฅเคช เคธเฅ‡เคŸ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ, เคœเคธเฅเคคเฅˆ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr " %s เคฎเคพ เคฒเฅ‡เค–เฅเคจ เค…เคธเค•เฅเคทเคฎ"
@@ -1824,8 +1851,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "DB เคซเคพเค‡เคฒ %s เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr " %s เคธเฅเคฅเคฟเคฐ เค—เคฐเฅเคจ เค…เคธเคซเคฒ"
@@ -1838,87 +1865,87 @@ msgstr "เคธเค‚เค—เฅเคฐเคน เคธเค‚เค— เคจเคฟเคฏเคจเฅเคคเฅเคฐเคฃ เคฐเฅ‡เค•เคฐเฅ
 msgid "Unable to get a cursor"
 msgstr "เค•เคฐเฅเคธเคฐ เคชเฅเคฐเคพเคชเฅเคค เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ %s เคชเคขเฅเคจ เค…เคธเค•เฅเคทเคฎ\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s เคธเฅเคฅเคฟเคฐ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: เคซเคพเค‡เคฒเคฎเคพ เคคเฅเคฐเฅเคŸเคฟเคนเคฐเฅ‚ เคฒเคพเค—เฅ‚ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s เคนเคฒ เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "เคŸเฅเคฐเฅ€ เคนเคฟเคกเคพเคˆเค เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s เค–เฅ‹เคฒเฅเคจ เค…เคธเคซเคฒ"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "เคฒเคฟเค™เฅเค• เคชเคขเฅเคจ เค…เคธเคซเคฒ %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "เค…เคจเคฒเคฟเค™เฅเค• เค—เคฐเฅเคจ เค…เคธเคซเคฒ %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s เคฎเคพ %s เคฒเคฟเค™เฅเค• เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "เคฏเคธ %sB เคนเคฟเคŸเค•เฅ‹ เคกเคฟ เคฒเคฟเค™เฅเค• เคธเคฟเคฎเคพเฅค\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "เคธเค‚เค—เฅเคฐเคน เคธเค‚เค— เค•เฅเคจเฅˆ เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเคเคŸ เค›เฅˆเคจ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "   %s เคธเค‚เค— เค•เฅเคจเฅˆ เค…เคงเคฟเคฒเฅ‡เค–เคจ เคชเฅเคฐเคตเคฟเคทเฅเคŸเคฟ เค›เฅˆเคจ\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s เคธเค‚เคญเคพเคฐเค•เคฐเฅเคคเคพ %s เคนเฅ‹ %s เคนเฅ‹เค‡เคจ\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "   %s เคธเค‚เค— เค•เฅเคจเฅˆ เค…เคงเคฟเคฒเฅ‡เค–เคจ เคชเฅเคฐเคตเคฟเคทเฅเคŸเคฟ เค›เฅˆเคจ\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "   %s เคธเค‚เค— เค•เฅเคจเฅˆ เค…เคงเคฟเคฒเฅ‡เค–เคจ เคชเฅเคฐเคตเคฟเคทเฅเคŸเคฟ เค›เฅˆเคจ\n"
@@ -1992,7 +2019,7 @@ msgstr "MD5 เค—เคฃเคจเคพ เค—เคฐเฅเคฆเคพ เคชเคขเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 msgid "Problem unlinking %s"
 msgstr "เคธเคฎเคธเฅเคฏเคพ เค…เคจเคฒเคฟเค™เฅเค• เคญเค‡เคฐเคนเฅ‡เค› %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr " %s เคฎเคพ  %s  เคชเฅเคจ:เคจเคพเคฎเค•เคฐเคฃ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
@@ -2050,23 +2077,23 @@ msgstr ""
 "  -c=? เคฏเฅ‹ เค•เคจเคซเคฟเค—เคฐเฅ‡เคธเคจ เคซเคพเค‡เคฒ เคชเคขเฅเคจเฅเคนเฅ‹เคธเฅ\n"
 "  -o=? เคเค‰เคŸเคพ เคธเฅเคตเฅ‡เคšเฅเค›เคพเคšเคพเคฐเฅ€ เค•เคจเคซเคฟเค—เคฐเฅ‡เคธเคจ เคตเคฟเค•เคฒเฅเคช เคธเฅ‡เคŸ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ, เคœเคธเฅเคคเฅˆ -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "เคชเคพเค‡เคชเคนเคฐเฅ‚ เคธเคฟเคฐเฅเคœเคจเคพ เค—เคฐเฅเคจ เค…เคธเคซเคฒ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "gzip เค•เคพเคฐเฅเคฏเคจเฅเคตเคฏเคจ เค—เคฐเฅเคจ เค…เคธเคซเคฒ"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "เคธเค‚เค—เฅเคฐเคน เคฆเฅ‚เคทเคฟเคค เคญเคฏเฅ‹"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "เคŸเคพเคฐ เคšเฅ‡เค•เคธเคฎ เค…เคธเคซเคฒ เคญเคฏเฅ‹, เคธเค‚เค—เฅเคฐเคน เคฆเฅ‚เคทเคฟเคค เคญเคฏเฅ‹"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "เค…เคœเฅเคžเคพเคค เคŸเคพเคฐ เคนเฅ‡เคกเคฐ เคชเฅเคฐเค•เคพเคฐ %u, เคธเคฆเคธเฅเคฏ %s"
@@ -2137,54 +2164,54 @@ msgstr "เคซเคพเค‡เคฒ %s เคฒเฅ‡เค–เฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 msgid "Failed to close file %s"
 msgstr "%s เคซเคพเค‡เคฒ เคฌเคจเฅเคฆ เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "เคฌเคพเคŸเฅ‹ %s เค…เคคเคฟ เคฒเคพเคฎเฅ‹ เค› "
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "เคเค• เคญเคจเฅเคฆเคพ เคฌเคขเฅ€ %s เค…เคจเคชเฅเคฏเคพเค• เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ %s เคซเฅ‡เคฐเคฟเคฏเฅ‹ "
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคฒเค•เฅเคทเคฟเคค เคฎเฅ‹เคกเคฎเคพ เคฒเฅ‡เค–เฅเคจเฅ‡ เคชเฅเคฏเคพเคธ เค—เคฐเฅเคฆเฅˆเค› %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "เค˜เฅเคฎเฅเคคเฅ€ เคฌเคพเคŸเฅ‹ เค…เคคเคฟ เคฒเคพเคฎเฅ‹ เค›"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ %s เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ เคตเคฟเคนเคฟเคจ เคฆเฅเคตเคพเคฐเคพ เคฌเคฆเคฒเคฟเคฆเฅˆเค›"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "เคฏเคธเค•เฅ‹ เคนเฅเคฏเคพเคธ เคฌเคพเคฒเฅเคŸเฅ€เคฎเคพ เคจเฅ‹เคก เคธเฅเคฅเคฟเคค เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "เคฌเคพเคŸเฅ‹ เค…เคคเคฟ เคฒเคพเคฎเฅ‹ เค›"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr " %s เค•เฅ‹ เคฒเคพเค—เคฟ เคธเค‚เคธเฅเค•เคฐเคจ เคฌเคฟเคจเคพ เค…เคงเคฟเคฒเฅ‡เค–เคจ เคชเฅเคฏเคพเค•เฅ‡เคœ เคฎเฅ‡เคฒ เค–เคพเคฏเฅ‹"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "เคซเคพเค‡เคฒ %s/%s เคฒเฅ‡ เคชเฅเคฏเคพเค•เฅ‡เคœ %s เคฎเคพ เคเค‰เคŸเคพ เค…เคงเคฟเคฒเฅ‡เค–เคจ เค—เคฐเฅเคฆเค›"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s เคธเฅเคฅเคฟเคฐ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
@@ -2263,30 +2290,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "เคšเคฏเคจ %s เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค•เคฟเคเคจ"
@@ -2356,6 +2383,16 @@ msgstr "%c%s... เคคเฅเคฐเฅเคŸเคฟ!"
 msgid "%c%s... Done"
 msgstr "%c%s... เค—เคฐเคฟเคฏเฅ‹"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... เค—เคฐเคฟเคฏเฅ‹"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2416,114 +2453,120 @@ msgstr "เคธเคฟเคกเฅ€ เคฐเฅ‹เคฎ เคธเฅเคฅเคฟเคฐ เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเ
 msgid "Problem closing the gzip file %s"
 msgstr "เคซเคพเค‡เคฒ เคฌเคจเฅเคฆ เค—เคฐเฅเคฆเคพ เคธเคฎเคธเฅเคฏเคพ"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "เคคเคพเคฒเฅเคšเคพ เคฎเคพเคฐเคฟเคเค•เฅ‹ เคซเคพเค‡เคฒ เคฎเคพเคคเฅเคฐ เคชเคขเฅเคจเค•เฅ‹ เคฒเคพเค—เคฟ เคคเคพเคฒเฅเคšเคพ เคฎเคพเคฐเฅเคจ เคชเฅเคฐเคฏเฅ‹เค— เค—เคฐเคฟเคเค•เฅ‹ เค›เฅˆเคจ %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "เคคเคพเคฒเฅเคšเคพ เคฎเคพเคฐเคฟเคเค•เฅ‹ เคซเคพเค‡เคฒ เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs เคฎเคพเค‰เคจเฅเคŸ เค—เคฐเคฟเคเค•เฅ‹ เคฒเค• เคซเคพเค‡เคฒเค•เฅ‹ เคฒเคพเค—เคฟ เคฒเค• เคชเฅเคฐเคฏเฅ‹เค— เค—เคฐเคฟเคเค•เฅ‹ เค›เฅˆเคจ %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "เคคเคพเคฒเฅเคšเคพ เคชเฅเคฐเคพเคชเฅเคค เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "เคธเคนเคพเคฏเค• เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ %s เคฒเฅ‡ เค–เคฃเฅเคกเคฟเค•เคฐเคฃ เค—เคฒเฅเคคเคฟ เคชเฅเคฐเคพเคชเฅเคค เคญเคฏเฅ‹ เฅค"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "เคธเคนเคพเคฏเค• เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ %s เคฒเฅ‡ เค–เคฃเฅเคกเคฟเค•เคฐเคฃ เค—เคฒเฅเคคเคฟ เคชเฅเคฐเคพเคชเฅเคค เคญเคฏเฅ‹ เฅค"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "เคธเคนเคพเคฏเค• เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ %s เคฒเฅ‡ เคเค‰เคŸเคพ เคคเฅเคฐเฅเคŸเคฟ เค•เฅ‹เคก เคซเคฐเฅเค•เคพเคฏเฅ‹ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "เคธเคนเคพเคฏเค• เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ %s เค…เคจเคชเฅ‡เค•เฅเคทเคฟเคค เคฌเคจเฅเคฆ เคญเคฏเฅ‹"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "เคซเคพเค‡เคฒ %s เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s เค•เฅ‹ เคฒเคพเค—เคฟ เคชเคพเค‡เคช เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "เคธเคนเคพเคฏเค• เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ IPC เคธเคฟเคฐเฅเคœเคจเคพ เค—เคฐเฅเคจ เค…เคธเคซเคฒ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "เคธเค™เฅเค•เฅเคšเคจเค•เคฐเฅเคคเคพ เค•เคพเคฐเฅเคฏเคพเคจเฅเคตเคฏเคจ เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "เคชเคกเฅเคจเฅเคนเฅ‹เคธเฅ, เค…เคนเคฟเคฒเฅ‡ เคธเคฎเฅเคฎ %lu เคชเคขเฅเคจ เค› เคคเคฐ เค•เฅเคจเฅˆ เคฌเคพเคเค•เฅ€ เค›เฅˆเคจ"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "เคฒเฅ‡เค–เฅเคจเฅเคนเฅ‹เคธเฅ, เค…เคนเคฟเคฒเฅ‡ เคธเคฎเฅเคฎ %lu เคฒเฅ‡เค–เฅเคจ เค› เคคเคฐ เคธเค•เคฟเคฆเฅˆเคจ "
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "เคซเคพเค‡เคฒ เคฌเคจเฅเคฆ เค—เคฐเฅเคฆเคพ เคธเคฎเคธเฅเคฏเคพ"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "เคซเคพเค‡เคฒ เค—เฅเคชเฅเคคเคฟเค•เคฐเคฃ เค—เคฐเฅเคฆเคพ เคธเคฎเคธเฅเคฏเคพ"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "เคซเคพเค‡เคฒ เค…เคจเคฒเคฟเค™เฅเค• เค—เคฐเฅเคฆเคพ เคธเคฎเคธเฅเคฏเคพ"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "เคซเคพเค‡เคฒ เค—เฅเคชเฅเคคเคฟเค•เคฐเคฃ เค—เคฐเฅเคฆเคพ เคธเคฎเคธเฅเคฏเคพ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "เคธเฅเคฅเคพเคชเคจเคพ เคชเคฐเคฟเคคเฅเคฏเคพเค— เค—เคฐเคฟเคฆเฅˆเค› เฅค"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "เค–เคพเคฒเฅ€ เคชเฅเคฏเคพเค•เฅ‡เคœ เค•เฅเคฏเคพเคธ"
@@ -2550,59 +2593,59 @@ msgstr "เคฏเฅ‹ APT เคฒเฅ‡ เคธเค‚เคธเฅเค•เคฐเคฃ เคชเฅเคฐเคฃเคพเคฒเฅ€เคฒเคพเคˆ เ
 msgid "The package cache was built for a different architecture"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เค•เฅเคฏเคพเคธ เคตเคฟเคญเคฟเคจเฅเคจ เคตเคพเคธเฅเคคเฅเค•เคฒเคพเค•เฅ‹ เคฒเคพเค—เคฟ เคจเคฟเคฐเฅเคฎเคพเคฃ เคญเคเค•เฅ‹ เคนเฅ‹"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "เค†เคงเคพเคฐเคฟเคค"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "เคชเฅเคจ:เค†เคงเคพเคฐเคฟเคค"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "เคธเฅเคเคพเคต เคฆเคฟเคจเฅเค›"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "เคธเคฟเคซเคพเคฐเคฟเคธ เค—เคฐเฅเคฆเค›"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "เคฆเฅเคตเคจเฅเคฆเคนเคฐเฅ‚"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "เคฌเคฆเคฒเฅเค›"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "เคตเฅ‡เค•เคพเคฏเคฎเคนเคฐเฅ‚"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "เคฎเคนเคคเฅเคตเคชเฅ‚เคฐเฅเคฃ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "เค†เคตเคถเฅเคฏเค•"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "เคฎเคพเคจเค•"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "เคตเฅˆเค•เคฒเฅเคชเคฟเค•"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "เค…เคคเคฟเคฐเคฟเค•เฅเคค"
 
@@ -2703,29 +2746,29 @@ msgstr "%s เค–เฅ‹เคฒเคฟเคฆเฅˆเค›"
 msgid "Line %u too long in source list %s."
 msgstr "เคฒเคพเค‡เคจ %u เคธเฅเคฐเฅ‹เคค เคธเฅ‚เคšเคฟ %s เคฎเคพ เค…เคคเคฟ เคฒเคพเคฎเฅ‹ เค› เฅค"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "เคตเฅˆเคฐเฅเคชเฅเคฏ เคฒเคพเค‡เคจ %u เคธเฅเคฐเฅ‹เคค เคธเฅ‚เคšเคฟเคฎเคพ %s (เคชเฅเคฐเค•เคพเคฐ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "เคธเฅเคฐเฅ‹เคค เคธเฅ‚เคšเฅ€ %s เคญเคฟเคคเฅเคฐ %u เคฒเคพเค‡เคจเคฎเคพ เคŸเคพเค‡เคช '%s' เคœเฅเคžเคพเคค เค›เฅˆเคจ"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "เคซเคพเค‡เคฒ %s เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2747,7 +2790,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ %s เคชเฅเคจ:เคธเฅเคฅเคพเคชเคจเคพ เคนเฅเคจ เคšเคพเคนเคจเฅเค›, เคคเคฐ เคฏเคธเค•เฅ‹ เคฒเคพเค—เคฟ เคฎเฅˆเคฒเฅ‡ เคเค‰เคŸเคพ เคธเค‚เค—เฅเคฐเคน เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค•เคฟเคจ เฅค"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2755,11 +2798,11 @@ msgstr ""
 "เคคเฅเคฐเฅเคŸเคฟ, pkgProblemResolver:: เคธเคฎเคพเคงเคพเคจเคฒเฅ‡ เคตเคฟเคšเฅเค›เฅ‡เคฆเคจ เคธเคฟเคฐเฅเคœเคจเคพ เค—เคฐเฅเคฆเค›, เคฏเฅ‹ เคญเค‡เคฐเคนเฅ‡เค•เฅ‹ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅเค•เฅ‹ "
 "เค•เคพเคฐเคฃเคฒเฅ‡ เค—เคฐเฅเคฆเคพ เคนเฅ‹ เฅค"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "เคธเคฎเคธเฅเคฏเคพเคนเคฐเฅ‚ เคธเฅเคงเคพเคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹, เคคเคชเคพเคˆเคเคฒเฅ‡ เคชเฅเคฏเคพเค•เฅ‡เคœเคนเคฐเฅ เคญเคพเคเคšเฅเคจเฅเคญเคฏเฅ‹ เฅค"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2768,7 +2811,7 @@ msgstr ""
 "เค•เฅ‡เคนเฅ€ เค…เคจเฅเค•เฅเคฐเคฎเคฃเคฟเค•เคพ เคซเคพเค‡เคฒเคนเคฐเฅ‚ เคกเคพเค‰เคจเคฒเฅ‹เคก เค—เคฐเฅเคจ เค…เคธเคซเคฒ เคญเคฏเฅ‹, เคคเคฟเคจเฅ€เคนเคฐเฅ‚ เค‰เคชเฅ‡เค•เฅเคทเคฟเคค เคญเค, เคตเคพ เคธเคŸเฅเคŸเคพเคฎเคพ เคชเฅเคฐเคพเคจเฅ‹ "
 "เคเค‰เคŸเคพ เคชเฅเคฐเคฏเฅ‹เค— เค—เคฐเคฟเคฏเฅ‹ เฅค"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "เค†เค‚เคถเคฟเค• เคธเฅ‚เคšเคฟเคนเคฐเฅเค•เฅ‹ เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ %s เคนเคฐเคพเค‡เคฐเคนเฅ‡เค› เฅค"
@@ -2805,17 +2848,17 @@ msgstr "เคตเคฟเคงเคฟ เคกเฅเคฐเคพเค‡เคญเคฐ %s เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจ เคธเค
 msgid "Method %s did not start correctly"
 msgstr "เคตเคฟเคงเคฟ %s เคธเคนเฅ€ เคฐเฅเคชเคฒเฅ‡ เคธเฅเคฐเฅ‚ เคนเฅเคจ เคธเค•เฅ‡เคจ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "เค•เฅƒเคชเคฏเคพ เคกเคฟเคธเฅเค• เคฒเฅ‡เคฌเฅเคฒ: '%s' เคกเฅเคฐเคพเค‡เคญ '%s'เคฎเคพ เค˜เฅเคธเค‰เคจเฅเคนเฅ‹เคธเฅ เคฐ เค‡เคจเฅเคŸเคฐ เคฅเคฟเคšเฅเคจเฅเคนเฅ‹เคธเฅ เฅค "
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "เคชเฅเคฏเคพเค•เคฟเค™เฅเค— เคชเฅเคฐเคฃเคพเคฒเฅ€ '%s' เคธเคฎเคฐเฅเคฅเคฟเคค เค›เฅˆเคจ"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "เค‰เคชเคฏเฅเค•เฅเคค เคชเฅเคฏเคพเค•เคฟเค™เฅเค— เคชเฅเคฐเคฃเคพเคฒเฅ€ เคชเฅเคฐเค•เคพเคฐ เคจเคฟเคฐเฅเคงเคพเคฐเคจ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ เคญเคฏเฅ‹"
 
@@ -2868,14 +2911,14 @@ msgstr "เค•เฅเคฏเคพเคธ เคธเค‚เค— เคเค‰เคŸเคพ เคจเคฎเคฟเคฒเฅเคฆเฅ‹ เคธเค‚เคธเฅ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr " %s เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค—เคฐเฅเคฆเคพ เคคเฅเคฐเฅเคŸเคฟ เคฆเฅ‡เค–เคพ เคชเคฐเฅเคฏเฅ‹ (pkg เคซเฅ‡เคฒเคพ เคชเคพเคฐเฅเคจเฅเคนเฅ‹เคธเฅ )"
@@ -2897,26 +2940,26 @@ msgstr "เคตเคพเคŠ, APT เคฒเฅ‡ เคธเค•เฅเคทเคฎ เค—เคฐเฅ‡เค•เฅ‹ เคธเค‚เคธเฅเค•เคฐ
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "เคตเคพเคŠ, APT เคฒเฅ‡ เคธเค•เฅเคทเคฎ เค—เคฐเฅ‡เค•เฅ‹ เคจเคฟเคฐเฅเคญเคฐเคคเคพเคนเคฐเฅเค•เฅ‹ เคจเคฎเฅเคฌเคฐเคฒเคพเคˆ เคคเคชเคพเคˆเคเคฒเฅ‡ เค‰เค›เคฟเคจเฅเคจเฅเคญเคฏเฅ‹ เฅค "
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "เคซเคพเค‡เคฒ เคจเคฟเคฐเฅเคญเคฐเคคเคพเคนเคฐเฅ‚ เคชเฅเคฐเค•เฅเคฐเคฟเคฏเคพ เค—เคฐเฅเคฆเคพ เคชเฅเคฏเคพเค•เฅ‡เคœ %s %s เคซเฅ‡เคฒเคพ เคชเคฐเฅ‡เคจ"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "เคธเฅเคฐเฅ‹เคค เคชเฅเคฏเคพเค•เฅ‡เคœ เคธเฅ‚เคšเฅ€ %s เคธเฅเคฅเคฟเคฐ เค—เคฐเฅเคจ เคธเค•เคฟเคเคจ "
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคธเฅ‚เคšเคฟเคนเคฐเฅ‚ เคชเคขเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "เคซเคพเค‡เคฒ เค‰เคชเคฒเคฌเฅเคงเคคเคพเคนเคฐเฅ‚ เคธเค‚เค•เคฒเคจ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "เคธเฅเคฐเฅ‹เคค เค•เฅเคฏเคพเคธ เคฌเคšเคค เค—เคฐเฅเคฆเคพ IO เคคเฅเคฐเฅเคŸเคฟ"
 
@@ -2929,54 +2972,54 @@ msgstr "เคชเฅเคจ:เคจเคพเคฎเค•เคฐเคฃ เค…เคธเคซเคฒ เค—เคฐเคฟเคฏเฅ‹, %s (%s -> %s)
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum เคฎเฅ‡เคฒ เคญเคเคจ"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum เคฎเฅ‡เคฒ เคญเคเคจ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเค‡เคฒ เคชเคฆ เคตเคฐเฅเคฃเคจ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ %s (เฅง)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "เคจเคฟเคฎเฅเคจ เค•เฅเคžเฅเคœเฅ€ IDs เค•เฅ‹ เคฒเคพเค—เคฟ เค•เฅเคจเฅˆ เคธเคพเคฐเฅเคตเคœเคจเคฟเค• เค•เฅเคžเฅเคœเฅ€ เค‰เคชเคฒเคฌเฅเคง เค›เฅˆเคจ:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2985,7 +3028,7 @@ msgstr ""
 "%s เคชเฅเคฏเคพเค•เฅ‡เคœเค•เฅ‹ เคฒเคพเค—เคฟ เคฎเฅˆเคฒเฅ‡ เคซเคพเค‡เคฒ เคธเฅเคฅเคฟเคค เค—เคฐเฅเคจ เคธเค•เคฟเคจ เฅค เคฏเคธเค•เฅ‹ เคฎเคคเคฒเคฌ เคคเคชเคพเคˆเคเคฒเฅ‡ เคฎเฅเคฏเคพเคจเฅเคฒเฅเคฒเฅ€ เคฏเฅ‹ เคชเฅเคฏเคพเค•เฅ‡เคœ "
 "เคจเคฟเคถเฅเคšเคฟเคค เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ เฅค (arch เคนเคฐเคพเคเคฐเคนเฅ‡เค•เฅ‹ เค•เคพเคฐเคฃเคฒเฅ‡) "
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2994,37 +3037,37 @@ msgstr ""
 "%s เคชเฅเคฏเคพเค•เฅ‡เคœเค•เฅ‹ เคฒเคพเค—เคฟ เคฎเฅˆเคฒเฅ‡ เคซเคพเค‡เคฒ เคธเฅเคฅเคฟเคค เค—เคฐเฅเคจ เคธเค•เคฟเคจ เฅค เคฏเคธเค•เฅ‹ เคฎเคคเคฒเคฌ เคคเคชเคพเคˆเคเคฒเฅ‡ เคฎเฅเคฏเคพเคจเฅเคฒเฅเคฒเฅ€ เคฏเฅ‹ เคชเฅเคฏเคพเค•เฅ‡เคœ "
 "เคจเคฟเคถเฅเคšเคฟเคค เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ เฅค"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เค…เคจเฅเค•เฅเคฐเคฎเคฃเคฟเค•เคพ เคซเคพเค‡เคฒเคนเคฐเฅ‚ เคฆเฅ‚เคทเคฟเคค เคญเค เฅค เคชเฅเคฏเคพเค•เฅ‡เคœ %s เค•เฅ‹ เคฒเคพเค—เคฟ เค•เฅเคจเฅˆ เคซเคพเค‡เคฒเคจเคพเคฎ: เคซเคพเคเคŸ เค›เฅˆเคจ เฅค"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "เคธเคพเค‡เคœ เคฎเฅ‡เคฒ เค–เคพเคเคจ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเค‡เคฒ เคชเคฆ เคตเคฐเฅเคฃเคจ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ %s (เฅง)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "เคฆเฅเคฐเคทเฅเคŸเคฌเฅเคฏ, %s เค•เฅ‹ เคธเคŸเฅเคŸเคพ  %s เคšเคฏเคจ เคญเค‡เคฐเคนเฅ‡เค›\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "เค˜เฅเคฎเคพเค‰เคฐเฅ‹ เคซเคพเค‡เคฒเคฎเคพ เค…เคตเฅˆเคง เคฒเคพเค‡เคจ:%s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "เคชเฅเคฏเคพเค•เฅ‡เคœ เคซเคพเค‡เคฒ เคชเคฆ เคตเคฐเฅเคฃเคจ เค—เคฐเฅเคจ เค…เคธเค•เฅเคทเคฎ %s (เฅง)"
@@ -3052,7 +3095,7 @@ msgstr "เคชเคฐเคฟเคšเคฏ เค—เคฐเคพเค‡เคฆเฅˆเค›.."
 msgid "Stored label: %s\n"
 msgstr "เคฒเฅ‡เคฌเฅเคฒ เคญเคฃเฅเคกเคพเคฐเคฃ เค—เคฐเฅเคจเฅเคนเฅ‹เคธเฅ:%s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "เคธเคฟเคกเฅ€ เคฐเฅ‹เคฎ เค…เคจเคฎเคพเค‰เคจเฅเคŸ เค—เคฐเคฟเคฆเฅˆเค›..."
@@ -3113,30 +3156,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "เคชเฅเคฏเค•เฅ‡เคœ เคธเฅ‚เคšเคฟเคนเคฐเฅ‚ เคชเฅเคฐเคคเคฟเคฒเคฟเคชเฅ€ เค—เคฐเคฟเคฆเฅˆเค›..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "เคจเคฏเคพเค เคธเฅเคฐเฅ‹เคค เคธเฅ‚เคšเคฟ เคฒเฅ‡เค–เคฟเคฆเฅˆเค›\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "เคฏเฅ‹ เคกเคฟเคธเฅเค•เค•เฅ‹ เคฒเคพเค—เคฟ เคธเฅเคฐเฅ‹เคค เคธเฅ‚เคšเคฟ เคชเฅเคฐเคตเคฟเคทเฅเคŸเคฟเคนเคฐเฅ‚:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i เคฐเฅ‡เค•เคฐเฅเคกเคนเคฐเฅ‚ เคฒเฅ‡เค–เคฟเคฏเฅ‹ เฅค\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เคนเคฐเคพเค‡เคฐเคนเฅ‡เค•เฅ‹ เคซเคพเค‡เคฒ %i เคนเคฐเฅ‚ เคธเค‚เค—เฅˆ %i เคฐเฅ‡เค•เคฐเฅเคกเคนเคฐเฅ‚ เคฒเฅ‡เค–เฅเคจเฅเคนเฅ‹เคธเฅ เฅค\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เคฎเฅ‡เคฒ เคจเค–เคพเคเค•เคพ เคซเคพเค‡เคฒ %i เคนเคฐเฅ‚ เคธเค‚เค—เฅˆ %i เคฐเฅ‡เค•เคฐเฅเคกเคนเคฐเฅ‚ เคฒเฅ‡เค–เฅเคจเฅเคนเฅ‹เคธเฅ เฅค\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "เคนเคฐเคพเค‡เคฐเคนเฅ‡เค•เฅ‹ เคซเคพเค‡เคฒ %i เคนเคฐเฅ‚ เคฐ เคฎเฅ‡เคฒ เคจเค–เคพเคเค•เคพ เคซเคพเค‡เคฒ %i เคนเคฐเฅ‚ เคธเค‚เค—เฅˆ %i เคฐเฅ‡เค•เคฐเฅเคกเคนเคฐเฅ‚ เคฒเฅ‡เค–เฅเคจเฅเคนเฅ‹เคธเฅ เฅค\n"
@@ -3151,17 +3194,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum เคฎเฅ‡เคฒ เคญเคเคจ"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "เคธเฅเคฅเคพเคชเคจเคพ เคชเคฐเคฟเคคเฅเคฏเคพเค— เค—เคฐเคฟเคฆเฅˆเค› เฅค"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3225,119 +3257,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr " %s เคธเฅเคฅเคพเคชเคจเคพ เคญเคฏเฅ‹"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr " %s เค•เคจเคซเคฟเค—เคฐ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr " %s เคนเคŸเคพเค‡เคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr " %s เคชเฅ‚เคฐเฅเคฃ เคฐเฅเคชเคฒเฅ‡ เคนเคŸเฅเคฏเฅ‹"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "เค†เค‚เคถเคฟเค• เคธเฅ‚เคšเคฟเคนเคฐเฅเค•เฅ‹ เคกเคพเค‡เคฐเฅ‡เค•เฅเคŸเฅเคฐเฅ€ %s เคนเคฐเคพเค‡เคฐเคนเฅ‡เค› เฅค"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "เคซเคพเค‡เคฒ %s เค–เฅ‹เคฒเฅเคจ เคธเค•เคฟเคเคจ"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr " %s เคคเคฏเคพเคฐ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s เค…เคจเคชเฅเคฏเคพเค• เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s เค•เคจเคซเคฟเค—เคฐ เค—เคฐเฅเคจ เคคเคฏเคพเคฐ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr " %s เคธเฅเคฅเคพเคชเคจเคพ เคญเคฏเฅ‹"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s เคนเคŸเคพเค‰เคจ เคคเคฏเคพเคฐ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr " %s เคนเคŸเฅเคฏเฅ‹"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s เคชเฅ‚เคฐเฅเคฃ เคฐเฅเคชเคฒเฅ‡ เคนเคŸเคพเค‰เคจ เคคเคฏเคพเคฐ เค—เคฐเคฟเคฆเฅˆเค›"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s เคชเฅ‚เคฐเฅเคฃ เคฐเฅเคชเคฒเฅ‡ เคนเคŸเฅเคฏเฅ‹"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3349,13 +3381,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3385,14 +3411,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr " '%s:%s' (%i) เคนเคฒ เค—เคฐเฅเคฆเคพ เค•เฅ‡เคนเฅ€ เคฆเฅเคทเฅเคŸ เค˜เคŸเฅเคฏเฅ‹"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... เค—เคฐเคฟเคฏเฅ‹"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "เค•เคจเคซเคฟเค—เคฐเฅ‡เคธเคจ เคซเคพเค‡เคฒ เค–เฅ‹เคฒเคฟเคฆเฅˆเค› %s"
 
diff --git a/po/nl.po b/po/nl.po
index 25d4af965..ef59d0e7e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2011-12-05 17:10+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -99,72 +99,72 @@ msgstr "Totale hoeveelheid verantwoorde ruimte: "
 msgid "Package file %s is out of sync."
 msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Geen pakketten gevonden"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "U dient precies รฉรฉn zoekpatroon op te geven"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kan pakket %s niet vinden"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Geรฏnstalleerd: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(geen)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s voor %s gecompileerd op %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,22 +238,30 @@ msgstr ""
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n"
 "Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 5.0.3 "
 "Schijf 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Aankoppelen van '%s' op '%s' is mislukt"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set."
 
@@ -492,7 +500,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
@@ -602,8 +610,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -642,7 +650,7 @@ msgstr "Afbreken."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Wilt u doorgaan [J/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s is mislukt  %s\n"
@@ -651,7 +659,7 @@ msgstr "Ophalen van %s is mislukt  %s\n"
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
@@ -735,7 +743,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
@@ -789,7 +797,7 @@ msgstr ""
 "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
 "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -800,80 +808,80 @@ msgstr ""
 "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
 "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geรฏnstalleerd worden:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s is ingesteld op automatische geรฏnstalleerd.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Klaar"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "%s %s downloaden"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 "worden"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -883,7 +891,7 @@ msgstr ""
 "'%s' op:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -895,87 +903,87 @@ msgstr ""
 "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
 "te halen.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geรฏnstalleerd is.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "U dient tenminste รฉรฉn pakket op te geven om de bouwvereisten van te "
 "controleren"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -984,7 +992,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -993,14 +1001,14 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Voldoen van Vereiste %s van pakket %s is mislukt: geรฏnstalleerde versie %s "
 "is te nieuw"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1009,7 +1017,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
 "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1018,30 +1026,30 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1130,7 +1138,7 @@ msgstr ""
 "voor meer informatie en opties.\n"
 "                       Deze APT heeft Super Koe kracht.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1205,7 +1213,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -1344,8 +1353,8 @@ msgstr "Verbinding is verlopen"
 msgid "Server closed the connection"
 msgstr "Verbinding is verbroken door de server"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Leesfout"
 
@@ -1358,8 +1367,8 @@ msgid "Protocol corruption"
 msgstr "Protocolcorruptie"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Schrijffout"
 
@@ -1413,7 +1422,7 @@ msgstr "Datasocket verbinding is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
@@ -1440,89 +1449,102 @@ msgstr "Zoekopdracht"
 msgid "Unable to invoke "
 msgstr "Aanroepen mislukt van "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kon niet verbinden met %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Er wordt verbinding gemaakt met %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kon '%s' niet vinden"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tijdelijke fout bij het opzoeken van '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kan geen verbinding maken met %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
 "niet bepalen?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste รฉรฉn ongeldige ondertekening gevonden."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kon 'gpgv' niet uitvoeren om ondertekening te verifiรซren (is gpgv "
 "geรฏnstalleerd?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1564,54 +1586,54 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Interne fout"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
@@ -1638,7 +1660,12 @@ msgstr "Geen spiegelbestand '%s' gevonden "
 msgid "Can not read mirror file '%s'"
 msgstr "Geen spiegelbestand '%s' gevonden "
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Geen spiegelbestand '%s' gevonden "
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spiegelserver: %s]"
@@ -1740,7 +1767,7 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand.\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan niet naar %s schrijven"
@@ -1889,8 +1916,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Kan het DB-bestand %s niet openen: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat op %s is mislukt"
@@ -1903,87 +1930,87 @@ msgstr "Archief heeft geen 'control'-record"
 msgid "Unable to get a cursor"
 msgstr "Kan geen cursor verkrijgen"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Kon map %s niet lezen\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Kon de status van %s niet opvragen\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "F: Er zijn fouten van toepassing op het bestand "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Oplossen van %s is mislukt"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Doorlopen boomstructuur is mislukt"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Openen van %s is mislukt"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " OntlLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink op %s is mislukt"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Ontlinken van %s is mislukt"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Linken van %s aan %s is mislukt"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Ontlinklimiet van %sB bereikt.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archief heeft geen 'package'-veld"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s heeft geen voorrangsingang\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s beheerder is %s, niet %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -2057,7 +2084,7 @@ msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
 msgid "Problem unlinking %s"
 msgstr "Probleem bij het ontlinken van %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Hernoemen van %s naar %s is mislukt"
@@ -2116,23 +2143,23 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Aanmaken pijp is mislukt"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Uitvoeren van gzip is mislukt "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Beschadigd archief"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
@@ -2203,54 +2230,54 @@ msgstr "Wegschrijven van bestand %s is mislukt"
 msgid "Failed to close file %s"
 msgstr "Sluiten van bestand %s is mislukt"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Het pad %s is te lang"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s wordt meer dan eens uitgepakt"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "De map %s is al omgeleid"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Het omleidingspad is te lang"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "De map %s wordt vervangen door een niet-map"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Vinden van de knoop in de hash-emmer is mislukt"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Het pad is te lang"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kan de status van %s niet opvragen"
@@ -2333,30 +2360,30 @@ msgstr ""
 "door de gebruiker is uitgeschakeld."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %liu %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liu %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"
@@ -2429,6 +2456,16 @@ msgstr "%c%s... Fout!"
 msgid "%c%s... Done"
 msgstr "%c%s... Klaar"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Klaar"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2491,117 +2528,123 @@ msgstr "stat op de CD-ROM is mislukt"
 msgid "Problem closing the gzip file %s"
 msgstr "Probleem bij het afsluiten van het gzip-bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-"
 "vergrendelingsbestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kon het vergrendelingsbestand '%s' niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kon vergrendeling %s niet verkrijgen"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subproces %s ontving een segmentatiefout."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subproces %s ontving signaal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subproces %s gaf de foutcode %u terug"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subproces %s sloot onverwacht af"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kon het bestand %s niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kon de bestandsindicator %d niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Aanmaken subproces-IPC is mislukt"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Uitvoeren van de compressor is mislukt "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Probleem bij het afsluiten van het bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Probleem bij het ontlinken van het bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Probleem bij het synchroniseren van het bestand"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Geen sleutelring geรฏnstalleerd in %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Lege pakketcache"
@@ -2628,59 +2671,59 @@ msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
 msgid "The package cache was built for a different architecture"
 msgstr "De pakketcache was aangemaakt voor een andere architectuur"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Vereisten"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Voor-Vereisten"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Suggesties"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Aanbevelingen"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Conflicteert met"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Verouderd"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Breekt"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Vult aan"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "belangrijk"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "noodzakelijk"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standaard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "optioneel"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2781,17 +2824,17 @@ msgstr "%s wordt geopend"
 msgid "Line %u too long in source list %s."
 msgstr "Regel %u van de bronlijst %s is te lang."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misvormde regel %u in bronlijst %s (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2800,12 +2843,12 @@ msgstr ""
 "Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie "
 "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Kon het bestand '%s' niet openen"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2830,7 +2873,7 @@ msgstr ""
 "Pakket %s moet opnieuw geรฏnstalleerd worden, maar er kan geen archief voor "
 "gevonden worden."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2838,11 +2881,11 @@ msgstr ""
 "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
 "veroorzaakt worden door vastgehouden pakketten."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2851,7 +2894,7 @@ msgstr ""
 "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
 "zijn oudere versies van gebruikt."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Lijstmap %spartial is afwezig."
@@ -2888,19 +2931,19 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 msgid "Method %s did not start correctly"
 msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
 "'enter' te drukken."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kan geen geschikt pakketsysteemtype bepalen"
 
@@ -2959,14 +3002,14 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Fout tijdens verwerken van %s (FindPkg)"
@@ -2989,28 +3032,28 @@ msgstr ""
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pakket %s %s werd niet gevonden bij het verwerken van de "
 "bestandsafhankelijkheden"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Pakketlijsten worden ingelezen"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Voorziene bestanden worden verzameld"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
 
@@ -3023,44 +3066,44 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
@@ -3068,12 +3111,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fout: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3082,7 +3125,7 @@ msgstr ""
 "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
 "dit pakket handmatig moet repareren (wegens missende architectuur)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, fuzzy, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3091,7 +3134,7 @@ msgstr ""
 "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
 "dit pakket handmatig moet repareren."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3099,31 +3142,31 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Geen secties in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Geen Hash-vermelding in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Geen 'Date'-vermelding in Release-bestand %s"
@@ -3151,7 +3194,7 @@ msgstr "Identificatie..."
 msgid "Stored label: %s\n"
 msgstr "Opgeslagen label: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD wordt afgekoppeld...\n"
 
@@ -3215,30 +3258,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Pakketlijsten worden gekopieerd..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Nieuwe bronlijst wordt weggeschreven\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i records weggeschreven met %i missende bestanden.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3255,17 +3298,6 @@ msgstr "Kan geen authenticatierecord vinden voor: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Geen sleutelring geรฏnstalleerd in %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3338,117 +3370,117 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "%s wordt geรฏnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wordt geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wordt volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "De verdwijning van %s wordt opgemerkt"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Post-installatie-trigger %s wordt uitgevoerd"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' ontbreekt"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kon het bestand '%s' niet openen"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geรฏnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Volledige verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
 "aangekoppeld?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "dpkg wordt uitgevoerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
 "(MaxReports) al is bereikt"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemen met vereisten - wordt niet geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3456,7 +3488,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
 "eerdere mislukking."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3472,13 +3504,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
 "over onvoldoende-geheugen."
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3512,22 +3538,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Niet vergrendeld"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Klaar"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is "
-#~ "niet bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-"
-#~ "fout: %s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Niet-bestaand bestand %s wordt overgeslagen"
 
diff --git a/po/nn.po b/po/nn.po
index f0d06112f..9758fd8ef 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -100,73 +100,73 @@ msgstr "Brukt plass i alt: "
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du mๅ oppgi n๘yaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert pๅ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,11 +239,19 @@ msgstr ""
 "  -o=? Set ei vilkๅrleg innstilling, t.d. ซ-o dir::cache=/tmpป.\n"
 "Du finn meir informasjon pๅ manualsidene apt-cache(8) og apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -251,12 +259,12 @@ msgstr ""
 " ซ%sป\n"
 "i stasjonen ซ%sป og trykk Enter.\n"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikkje endra namnet pๅ %s til %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -495,7 +503,7 @@ msgstr "%s kan ikkje installerast pๅ nytt, for pakken kan ikkje lastast ned.\n"
 msgid "%s is already the newest version.\n"
 msgstr "Den nyaste versjonen av %s er installert frๅ f๘r.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
@@ -604,8 +612,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
@@ -645,7 +653,7 @@ msgstr "Avbryt."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
@@ -654,7 +662,7 @@ msgstr "Klarte ikkje henta %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
@@ -732,7 +740,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "F๘lgjande informasjon kan hjelpa med ๅ l๘ysa situasjonen:"
 
@@ -782,7 +790,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan pr๘va ซapt-get -f installป (eller velja "
 "ei l๘ysing)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -794,86 +802,86 @@ msgstr ""
 "distribusjonen, kan det ๒g henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i ซIncomingป."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ุydelagde pakkar"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Dei f๘lgjande tilleggspakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "F๘reslๅtte pakkar:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Tilrๅdde pakkar"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Ferdig"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade ๘ydelagde noko"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje lๅsa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du mๅ velja minst ้in pakke som kjeldekoden skal hentast for"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -881,105 +889,105 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frๅ f๘r i %s\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Mๅ henta %sB/%sB med kjeldekodearkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Mๅ henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frๅ f๘r i %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen ซ%sป mislukkast.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen ซ%sป mislukkast.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du mๅ velja minst ein pakke som byggjekrava skal sjekkast for"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -988,37 +996,37 @@ msgstr ""
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "St๘tta modular:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1104,7 +1112,7 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1175,7 +1183,8 @@ msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert frๅ f๘r.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta pๅ %s, men den fanst ikkje"
@@ -1315,8 +1324,8 @@ msgstr "Tidsavbrot pๅ samband"
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1329,8 +1338,8 @@ msgid "Protocol corruption"
 msgstr "Protokoll๘ydeleggjing"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Skrivefeil"
 
@@ -1384,7 +1393,7 @@ msgstr "Tidsavbrot pๅ tilkopling til datasokkel"
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n๘kkel for fil"
 
@@ -1411,86 +1420,99 @@ msgstr "Sp๘rjing"
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot pๅ sambandet"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikkje kopla til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikkje slๅ opp ซ%sป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Mellombels feil ved oppslag av ซ%sป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Det hende noko dumt ved oppslag av ซ%s:%sป (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Det hende noko dumt ved oppslag av ซ%s:%sป (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei f๘lgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1528,53 +1550,53 @@ msgstr "Denne HTTP-tenaren har ๘ydelagd st๘tte for omrๅde"
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Tidsavbrot pๅ sambandet"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frๅ tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Feil ved lesing frๅ tenaren"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ุydelagde hovuddata"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Intern feil"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
@@ -1601,7 +1623,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Klarte ikkje opna fila %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1693,7 +1720,7 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkๅrleg innstilling, t.d. ซ-o dir::cache=/tmpป.\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
@@ -1836,8 +1863,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikkje opna DB-fila %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikkje fๅ status til %s"
@@ -1850,87 +1877,87 @@ msgstr "Arkivet har ingen kontrollpost"
 msgid "Unable to get a cursor"
 msgstr "Klarte ikkje fๅ peikar"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "ล: Klarte ikkje lesa katalogen %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "ล: Klarte ikkje fๅ status til %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "ล: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "F: Det er feil ved fila "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Klarte ikkje slๅ opp %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Treklatring mislukkast"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Klarte ikkje opna %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikkje lesa lenkja %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Klarte ikkje oppheva lenkja %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikkje lenkja %s til %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa pๅ %sB er nๅdd.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arkivet har ikkje noko pakkefelt"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har inga overstyringsoppf๘ring\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har inga overstyringsoppf๘ring\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har inga overstyringsoppf๘ring\n"
@@ -2004,7 +2031,7 @@ msgstr "Klarte ikkje lesa under utrekning av MD5"
 msgid "Problem unlinking %s"
 msgstr "Problem ved oppheving av lenkje til %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet pๅ %s til %s"
@@ -2062,23 +2089,23 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkๅrleg innstilling, t.d. ซ-o dir::cache=/tmpป.\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Klarte ikkje oppretta r๘yr"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Klarte ikkje k๘yra gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ุydelagt arkiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislukkast, arkivet er ๘ydelagt"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"
@@ -2149,54 +2176,54 @@ msgstr "Klarte ikkje skriva fila %s"
 msgid "Failed to close file %s"
 msgstr "Klarte ikkje lukka fila %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stigen %s er for lang"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakkar ut %s meir enn ้in gong"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s er avleidd"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakken pr๘ver ๅ skriva til avleiingsmๅlet %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Avleiingsstigen er for lang"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fann ikkje noden i n๘kkelb๘tta"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Stigen er for lang"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriv over pakketreff utan versjon for %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje fๅ status til %s"
@@ -2276,30 +2303,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
@@ -2369,6 +2396,16 @@ msgstr "%c%s ... Feil"
 msgid "%c%s... Done"
 msgstr "%c%s ... Ferdig"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2429,114 +2466,120 @@ msgstr "Klarte ikkje fๅ status til CD-ROM"
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved lๅsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brukar ikkje lๅsing for den skrivebeskytta lๅsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikkje opna lๅsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brukar ikkje lๅsing for den nfs-monterte lๅsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Klarte ikkje lๅsa %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikkje opna r๘yr for %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikkje oppretta underprosessen IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Klarte ikkje k๘yra komprimeringa "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lese, har framleis %lu att ๅ lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har framleis %lu att ๅ skrive, men klarte ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved lๅsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
@@ -2563,59 +2606,59 @@ msgstr "APT st๘ttar ikkje versjonssystemet ซ%sป"
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Tilrๅdingar"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "pๅkravd"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "tillegg"
 
@@ -2716,29 +2759,29 @@ msgstr "Opnar %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linja %u i kjeldelista %s er for lang."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misforma linje %u i kjeldelista %s (type)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen ซ%sป er ukjend i linja %u i kjeldelista %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2761,7 +2804,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Pakken %s mๅ installerast pๅ nytt, men arkivet finst ikkje."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2769,12 +2812,12 @@ msgstr ""
 "Feil, ซpkgProblemResolver::Resolveป har laga brot. Dette kan skuldast pakkar "
 "som er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre ๘ydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2783,7 +2826,7 @@ msgstr ""
 "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
 "filer er brukte i staden."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listekatalogen %spartial manglar."
@@ -2820,7 +2863,7 @@ msgstr "Finn ikkje metodedrivaren %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2828,12 +2871,12 @@ msgstr ""
 " ซ%sป\n"
 "i stasjonen ซ%sป og trykk Enter.\n"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet ซ%sป er ikkje st๘tta"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
@@ -2887,14 +2930,14 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Feil ved behandling av %s (FindPkg)"
@@ -2916,26 +2959,26 @@ msgstr "J๘ss, du har overgๅtt talet pๅ versjonar som APT kan handtera."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "J๘ss, du har overgๅtt talet pๅ krav som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikkje fๅ status pๅ kjeldepakkelista %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Les pakkelister"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Samlar inn filtilbod"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IU-feil ved lagring av kjeldelager"
 
@@ -2948,54 +2991,54 @@ msgstr "endring av namn mislukkast, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3004,7 +3047,7 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du mๅ fiksa denne pakken sj๘lv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3012,38 +3055,38 @@ msgid ""
 msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du mๅ fiksa denne pakken sj๘lv."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pakkeindeksfilene er ๘ydelagde. Feltet ซFilename:ป manglar for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
@@ -3071,7 +3114,7 @@ msgstr "Identifiserer ... "
 msgid "Stored label: %s\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Avmonterer CD-ROM ..."
@@ -3132,30 +3175,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppf๘ringar for denne disken er:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
@@ -3170,17 +3213,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3244,119 +3276,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrๅdingar"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3368,13 +3400,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3404,14 +3430,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Det hende noko dumt ved oppslag av ซ%s:%sป (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s ... Ferdig"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Opnar oppsettsfila %s"
 
diff --git a/po/pl.po b/po/pl.po
index d38b5d56c..e759017df 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-07-28 21:53+0200\n"
 "Last-Translator: Michaล‚ Kuล‚ach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -101,74 +101,74 @@ msgstr "Caล‚kowity rozmiar: "
 msgid "Package file %s is out of sync."
 msgstr "Plik pakietu %s jest przestarzaล‚y."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nie znaleziono ลผadnych pakietรณw"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Naleลผy podaฤ‡ przynajmniej jeden wzorzec"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "To polecenie jest przestarzaล‚e. Prosimy uลผywaฤ‡ \"apt-mark showauto\"."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nie udaล‚o siฤ™ odnaleลบฤ‡ pakietu %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Plikรณw pakietรณw:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Magazyn podrฤ™czny jest przestarzaล‚y, nie moลผna odwoล‚aฤ‡ siฤ™ (x-ref) do pliku "
 "pakietu."
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Przypiฤ™te pakiety:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nie znaleziono)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandydujฤ…ca: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(brak)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Sposรณb przypiฤ™cia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s dla %s skompilowany %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,20 +239,28 @@ msgstr ""
 "Wiฤ™cej informacji moลผna znaleลบฤ‡ na stronach podrฤ™cznika apt-cache(8)\n"
 "oraz apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Proszฤ™ wprowadziฤ‡ nazwฤ™ dla tej pล‚yty, np. \"Debian 5.0.3 Disk 1\""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Proszฤ™ wล‚oลผyฤ‡ dysk do napฤ™du i nacisnฤ…ฤ‡ enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nie udaล‚o siฤ™ zamontowaฤ‡ \"%s\" w \"%s\""
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Naleลผy powtรณrzyฤ‡ ten proces dla reszty pล‚yt."
 
@@ -490,7 +498,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "%s jest juลผ w najnowszej wersji.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany rฤ™cznie.\n"
@@ -599,8 +607,8 @@ msgstr "Po tej operacji zostanie dodatkowo uลผyte %sB miejsca na dysku.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nie udaล‚o siฤ™ ustaliฤ‡ iloล›ci wolnego miejsca w %s"
@@ -640,7 +648,7 @@ msgstr "Przerwane."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Kontynuowaฤ‡ [T/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udaล‚o siฤ™ pobraฤ‡ %s  %s\n"
@@ -649,7 +657,7 @@ msgstr "Nie udaล‚o siฤ™ pobraฤ‡ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Nie udaล‚o siฤ™ pobraฤ‡ niektรณrych plikรณw"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Ukoล„czono pobieranie w trybie samego pobierania"
 
@@ -736,7 +744,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Nastฤ™pujฤ…ce informacje mogฤ… pomรณc rozwiฤ…zaฤ‡ sytuacjฤ™:"
 
@@ -799,7 +807,7 @@ msgstr ""
 "Niespeล‚nione zaleลผnoล›ci. Proszฤ™ sprรณbowaฤ‡ wykonaฤ‡ \"apt-get -f install\" bez "
 "pakietรณw (lub podaฤ‡ rozwiฤ…zanie)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -811,33 +819,33 @@ msgstr ""
 "w ktรณrej niektรณre pakiety nie zostaล‚y jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzฤ…ce\")."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pakiety sฤ… uszkodzone"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Zostanฤ… zainstalowane nastฤ™pujฤ…ce dodatkowe pakiety:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udaล‚o siฤ™ odnaleลบฤ‡ pakietu %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s zaznaczony jako zainstalowany automatycznie.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -845,48 +853,48 @@ msgstr ""
 "To polecenie jest przestarzaล‚e. Prosimy uลผywaฤ‡ \"apt-mark auto\" i \"apt-"
 "mark manual\"."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Nie udaล‚o siฤ™"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Gotowe"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Bล‚ฤ…d wewnฤ™trzny, spowodowany przez moduล‚ rozwiฤ…zywania problemรณw"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Nie udaล‚o siฤ™ zablokowaฤ‡ katalogu pobierania"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nie moลผna znaleลบฤ‡ ลบrรณdล‚a do pobrania wersji \"%s\" pakietu \"%s\""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Pobieranie %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Naleลผy podaฤ‡ przynajmniej jeden pakiet, dla ktรณrego majฤ… zostaฤ‡ pobrane "
 "ลบrรณdล‚a"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie udaล‚o siฤ™ odnaleลบฤ‡ ลบrรณdล‚a dla pakietu %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -896,7 +904,7 @@ msgstr ""
 "pod adresem:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -908,70 +916,70 @@ msgstr ""
 "by pobraฤ‡ najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
 "pakietu.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie juลผ pobranego pliku \"%s\"\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "W %s nie ma wystarczajฤ…cej iloล›ci wolnego miejsca"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwรณw ลบrรณdeล‚.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwรณw ลบrรณdeล‚.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobieranie ลบrรณdeล‚ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Nie udaล‚o siฤ™ pobraฤ‡ niektรณrych archiwรณw."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pomijanie rozpakowania juลผ rozpakowanego ลบrรณdล‚a w %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodล‚o.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Proszฤ™ sprawdziฤ‡ czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodล‚o.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Proces potomny zawiรณdล‚"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Naleลผy podaฤ‡ przynajmniej jeden pakiet, dla ktรณrego majฤ… zostaฤ‡ sprawdzone "
 "zaleลผnoล›ci dla budowania"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -980,17 +988,17 @@ msgstr ""
 "Nie znaleziono informacji o architekturze dla %s. Proszฤ™ zapoznaฤ‡ siฤ™ z apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nie udaล‚o siฤ™ pobraฤ‡ informacji o zaleลผnoล›ciach dla budowania %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zaleลผnoล›ci dla budowania.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -999,7 +1007,7 @@ msgstr ""
 "Zaleลผnoล›ฤ‡ %s od %s nie moลผe zostaฤ‡ speล‚niona, poniewaลผ %s nie jest dozwolone "
 "w pakietach \"%s\""
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1008,14 +1016,14 @@ msgstr ""
 "Zaleลผnoล›ฤ‡ %s od %s nie moลผe zostaฤ‡ speล‚niona, poniewaลผ nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nie udaล‚o siฤ™ speล‚niฤ‡ zaleลผnoล›ci %s od %s: Zainstalowany pakiet %s jest zbyt "
 "nowy"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1024,7 +1032,7 @@ msgstr ""
 "Zaleลผnoล›ฤ‡ %s od %s nie moลผe zostaฤ‡ speล‚niona, poniewaลผ kandydujฤ…ca wersja "
 "pakietu %s nie speล‚nia wymagaล„ wersji"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1033,30 +1041,30 @@ msgstr ""
 "Zaleลผnoล›ฤ‡ %s od %s nie moลผe zostaฤ‡ speล‚niona, poniewaลผ pakiet %s nie ma "
 "wersji kandydujฤ…cej"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nie udaล‚o siฤ™ speล‚niฤ‡ zaleลผnoล›ci %s od %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nie udaล‚o siฤ™ speล‚niฤ‡ zaleลผnoล›ci dla budowania %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Nie udaล‚o siฤ™ przetworzyฤ‡ zaleลผnoล›ci dla budowania"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dziennik zmian %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Obsล‚ugiwane moduล‚y:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1144,7 +1152,7 @@ msgstr ""
 "apt-get(8), sources.list(5) i apt.conf(5).\n"
 "                         Ten APT ma moce Super Krowy.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1222,7 +1230,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s zostaล‚ juลผ odznaczony jako zatrzymany.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie byล‚o go"
@@ -1385,8 +1394,8 @@ msgstr "Przekroczenie czasu poล‚ฤ…czenia"
 msgid "Server closed the connection"
 msgstr "Serwer zamknฤ…ล‚ poล‚ฤ…czenie"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Bล‚ฤ…d odczytu"
 
@@ -1399,8 +1408,8 @@ msgid "Protocol corruption"
 msgstr "Naruszenie zasad protokoล‚u"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Bล‚ฤ…d zapisu"
 
@@ -1454,7 +1463,7 @@ msgstr "Przekroczony czas poล‚ฤ…czenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie udaล‚o siฤ™ przyjฤ…ฤ‡ poล‚ฤ…czenia"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Nie udaล‚o siฤ™ obliczyฤ‡ skrรณtu pliku"
 
@@ -1481,88 +1490,101 @@ msgstr "Info"
 msgid "Unable to invoke "
 msgstr "Nie moลผna wywoล‚aฤ‡ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ลฤ…czenie z %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nie udaล‚o siฤ™ utworzyฤ‡ gniazda dla %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nie udaล‚o siฤ™ zainicjalizowaฤ‡ poล‚ฤ…czenia z %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nie udaล‚o siฤ™ poล‚ฤ…czyฤ‡ z %s:%s (%s), przekroczenie czasu poล‚ฤ…czenia"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nie udaล‚o siฤ™ poล‚ฤ…czyฤ‡ z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ลฤ…czenie z %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie udaล‚o siฤ™ przetล‚umaczyฤ‡ nazwy \"%s\""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tymczasowy bล‚ฤ…d przy tล‚umaczeniu \"%s\""
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Coล› niewล‚aล›ciwego staล‚o siฤ™ przy tล‚umaczeniu \"%s:%s\" (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Coล› niewล‚aล›ciwego staล‚o siฤ™ przy tล‚umaczeniu \"%s:%s\" (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nie udaล‚o siฤ™ poล‚ฤ…czyฤ‡ z %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Bล‚ฤ…d wewnฤ™trzny: Prawidล‚owy podpis, ale nie udaล‚o siฤ™ ustaliฤ‡ odcisku klucza!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidล‚owy podpis."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nie udaล‚o siฤ™ uruchomiฤ‡ gpgv by zweryfikowaฤ‡ podpis (czy gpgv jest "
 "zainstalowane?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Nieznany bล‚ฤ…d podczas uruchamiania gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Nastฤ™pujฤ…ce podpisy byล‚y bล‚ฤ™dne:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1602,53 +1624,53 @@ msgstr "Ten serwer HTTP nieprawidล‚owo obsล‚uguje zakresy (ranges)"
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Operacja select nie powiodล‚a siฤ™"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu poล‚ฤ…czenia"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Bล‚ฤ…d przy pisaniu do pliku wyjล›ciowego"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Bล‚ฤ…d przy pisaniu do pliku"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Bล‚ฤ…d przy pisaniu do pliku"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Bล‚ฤ…d czytania z serwera: Zdalna strona zamknฤ™ล‚a poล‚ฤ…czenie"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Bล‚ฤ…d czytania z serwera"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Bล‚ฤ™dne dane nagล‚รณwka"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Poล‚ฤ…czenie nie powiodล‚o siฤ™"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Bล‚ฤ…d wewnฤ™trzny"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie moลผna czytaฤ‡ %s"
@@ -1675,7 +1697,12 @@ msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\""
 msgid "Can not read mirror file '%s'"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ pliku serwera lustrzanego \"%s\""
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ pliku serwera lustrzanego \"%s\""
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Serwer lustrzany: %s]"
@@ -1774,7 +1801,7 @@ msgstr ""
 "  -c=? Czyta wskazany plik konfiguracyjny.\n"
 "  -o=? Ustawia dowolnฤ… opcjฤ™ konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nie udaล‚o siฤ™ pisaฤ‡ do %s"
@@ -1922,8 +1949,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ pliku bazy %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nie udaล‚o siฤ™ wykonaฤ‡ operacji stat na %s"
@@ -1936,87 +1963,87 @@ msgstr "Archiwum nie posiada rekordu kontrolnego"
 msgid "Unable to get a cursor"
 msgstr "Nie udaล‚o siฤ™ pobraฤ‡ kursora"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Nie udaล‚o siฤ™ odczytaฤ‡ katalogu %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Nie moลผna wykonaฤ‡ operacji stat na %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Bล‚ฤ™dy odnoszฤ… siฤ™ do pliku "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nie udaล‚o siฤ™ przetล‚umaczyฤ‡ nazwy %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Przejล›cie po drzewie nie powiodล‚o siฤ™"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Odล‚ฤ…czenie %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nie udaล‚o siฤ™ odczytaฤ‡ dowiฤ…zania %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nie udaล‚o siฤ™ usunฤ…ฤ‡ %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nie udaล‚o siฤ™ dowiฤ…zaฤ‡ %s do %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Osiฤ…gniฤ™to ograniczenie odล‚ฤ…czania %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archiwum nie posiadaล‚o pola pakietu"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nie posiada wpisu w pliku override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  opiekunem %s jest %s, a nie %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nie posiada wpisu w pliku override ลบrรณdeล‚\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nie posiada rรณwnieลผ wpisu w pliku override binariรณw\n"
@@ -2090,7 +2117,7 @@ msgstr "Nie udaล‚o siฤ™ czytanie w czasie liczenia skrรณtu MD5"
 msgid "Problem unlinking %s"
 msgstr "Problem przy usuwaniu %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nie udaล‚o siฤ™ zmieniฤ‡ nazwy %s na %s"
@@ -2148,23 +2175,23 @@ msgstr ""
 "  -c=? Czyta wskazany plik konfiguracyjny.\n"
 "  -o=? Ustawia dowolnฤ… opcjฤ™ konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Nie udaล‚o siฤ™ utworzyฤ‡ potokรณw"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Nie udaล‚o siฤ™ uruchomiฤ‡ programu gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Uszkodzone archiwum"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nieznany typ nagล‚รณwka TAR %u, skล‚adnik %s"
@@ -2235,54 +2262,54 @@ msgstr "Nie udaล‚o siฤ™ zapisaฤ‡ pliku %s"
 msgid "Failed to close file %s"
 msgstr "Nie udaล‚o siฤ™ zamknฤ…ฤ‡ pliku %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ลšcieลผka %s jest zbyt dล‚uga"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Wypakowanie %s wiฤ™cej niลผ raz"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ominiฤ™cie katalogu %s"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pakiet prรณbuje pisaฤ‡ do celu ominiฤ™cia %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Zbyt dล‚uga ล›cieลผka ominiฤ™cia"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Katalog %s zostaล‚ zastฤ…piony obiektem nie bฤ™dฤ…cym katalogiem"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nie udaล‚o siฤ™ znaleลบฤ‡ wฤ™zล‚a w jego kubeล‚ku haszujฤ…cym"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ลšcieลผka jest zbyt dล‚uga"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Nadpisujฤ…cy pakiet nie pasuje z wersjฤ… %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nie moลผna wykonaฤ‡ operacji stat na %s"
@@ -2366,30 +2393,30 @@ msgstr ""
 "zostaล‚o wyล‚ฤ…czone przez uลผytkownika."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lidni %lig %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lig %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"
@@ -2461,6 +2488,16 @@ msgstr "%c%s... Bล‚ฤ…d!"
 msgid "%c%s... Done"
 msgstr "%c%s... Gotowe"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Gotowe"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2521,45 +2558,45 @@ msgstr "Nie udaล‚o siฤ™ wykonaฤ‡ operacji stat na CDROM-ie"
 msgid "Problem closing the gzip file %s"
 msgstr "Problem przy zamykaniu pliku gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie uลผyta blokada"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ pliku blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie uลผyta blokada"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nie udaล‚o siฤ™ uzyskaฤ‡ blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 "Lista plikรณw nie moลผe zostaฤ‡ stworzona, poniewaลผ \"%s\" nie jest katalogiem"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignorowanie \"%s\" w katalogu \"%s\", poniewaลผ nie jest to zwykล‚y plik"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Ignorowanie pliku \"%s\" w katalogu \"%s\", poniewaลผ nie ma on rozszerzenia "
 "pliku"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2567,73 +2604,79 @@ msgstr ""
 "Ignorowanie pliku \"%s\" w katalogu \"%s\", poniewaลผ ma on nieprawidล‚owe "
 "rozszerzenie pliku"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s spowodowaล‚ naruszenie ochrony pamiฤ™ci."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s otrzymaล‚ sygnaล‚ %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s zwrรณciล‚ kod bล‚ฤ™du (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s zakoล„czyล‚ siฤ™ niespodziewanie"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ deskryptora pliku %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Nie udaล‚o siฤ™ utworzyฤ‡ IPC z podprocesem"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Nie udaล‚o siฤ™ uruchomiฤ‡ kompresora "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "naleลผaล‚o przeczytaฤ‡ jeszcze %llu, ale nic nie zostaล‚o"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "naleลผaล‚o zapisaฤ‡ jeszcze %llu, ale nie udaล‚o siฤ™ to"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem przy zamykaniu pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem przy zapisywaniu pliku %s w %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem przy odlinkowywaniu pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problem przy zapisywaniu pliku na dysk"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Brak zainstalowanej bazy kluczy w %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Pusty magazyn podrฤ™czny pakietรณw"
@@ -2659,59 +2702,59 @@ msgstr "Ta wersja APT nie obsล‚uguje systemu wersji \"%s\""
 msgid "The package cache was built for a different architecture"
 msgstr "Ten magazyn podrฤ™czny pakietรณw zostaล‚ zbudowany dla innej architektury"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Wymaga"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Wymaga wstฤ™pnie"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Poleca"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "W konflikcie z"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Zastฤ™puje"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Dezaktualizuje"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Narusza zaleลผnoล›ci"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Rozszerza"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "waลผny"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "wymagany"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standardowy"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcjonalny"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "dodatkowy"
 
@@ -2813,17 +2856,17 @@ msgstr "Otwieranie %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linia %u w liล›cie ลบrรณdeล‚ %s jest zbyt dล‚uga."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Nieprawidล‚owa linia %u w liล›cie ลบrรณdeล‚ %s (typ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ \"%s\" jest nieznany w linii %u listy ลบrรณdeล‚ %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2833,12 +2876,12 @@ msgstr ""
 "5 apt.conf\" i zapoznaฤ‡ siฤ™ z wpisem APT::Immediate-Configure aby dowiedzieฤ‡ "
 "siฤ™ wiฤ™cej. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nie udaล‚o siฤ™ skonfigurowaฤ‡ \"%s\". "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2863,7 +2906,7 @@ msgstr ""
 "Pakiet %s ma zostaฤ‡ ponownie zainstalowany, ale nie moลผna znaleลบฤ‡ jego "
 "archiwum."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2871,11 +2914,11 @@ msgstr ""
 "Bล‚ฤ…d, pkgProblemResolver::Resolve zwrรณciล‚ bล‚ฤ…d, moลผe to byฤ‡ spowodowane "
 "zatrzymanymi pakietami."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nie udaล‚o siฤ™ naprawiฤ‡ problemรณw, zatrzymano uszkodzone pakiety."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2883,7 +2926,7 @@ msgstr ""
 "Nie udaล‚o siฤ™ pobraฤ‡ niektรณrych plikรณw indeksu, zostaล‚y one zignorowane lub "
 "uลผyto ich starszej wersji."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Brakuje katalogu list %spartial."
@@ -2920,17 +2963,17 @@ msgstr "Nie udaล‚o siฤ™ odnaleลบฤ‡ sterownika metody %s."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nie uruchomiล‚a siฤ™ poprawnie"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Proszฤ™ wล‚oลผyฤ‡ do napฤ™du \"%s\" dysk o nazwie: \"%s\" i nacisnฤ…ฤ‡ enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "System pakietรณw \"%s\" nie jest obsล‚ugiwany"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nie udaล‚o siฤ™ okreล›liฤ‡ odpowiedniego typu systemu pakietรณw"
 
@@ -2985,14 +3028,14 @@ msgstr "Magazyn podrฤ™czny ma niezgodny system wersji"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Wystฤ…piล‚ bล‚ฤ…d podczas przetwarzania %s (%s%d)"
@@ -3013,27 +3056,27 @@ msgstr "Przekroczono liczbฤ™ opisรณw, ktรณrฤ… ten APT jest w stanie obsล‚uลผyฤ‡.
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Przekroczono liczbฤ™ zaleลผnoล›ci, ktรณrฤ… ten APT jest w stanie obsล‚uลผyฤ‡."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pakiet %s %s nie zostaล‚ odnaleziony podczas przetwarzania zaleลผnoล›ci plikรณw"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nie udaล‚o siฤ™ wykonaฤ‡ operacji stat na liล›cie pakietรณw ลบrรณdล‚owych %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Czytanie list pakietรณw"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Zbieranie zapewnieล„ plikรณw"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Bล‚ฤ…d wejล›cia/wyjล›cia przy zapisywaniu podrฤ™cznego magazynu ลบrรณdeล‚"
 
@@ -3046,12 +3089,12 @@ msgstr "nie udaล‚o siฤ™ zmieniฤ‡ nazwy, %s (%s -> %s)"
 msgid "MD5Sum mismatch"
 msgstr "Bล‚ฤ™dna suma MD5"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Bล‚ฤ™dna suma kontrolna"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3060,16 +3103,16 @@ msgstr ""
 "Nie udaล‚o siฤ™ znaleลบฤ‡ oczekiwanego wpisu \"%s\" w pliku Release "
 "(nieprawidล‚owy wpis sources.list lub nieprawidล‚owy plik)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nie udaล‚o siฤ™ znaleลบฤ‡ sumy kontrolnej \"%s\" w pliku Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Dla nastฤ™pujฤ…cych identyfikatorรณw kluczy brakuje klucza publicznego:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3078,27 +3121,27 @@ msgstr ""
 "Plik Release dla %s wygasnฤ…ล‚ (nieprawidล‚owy od %s). Aktualizacje z tego "
 "repozytorium nie bฤ™dฤ… wykonywane."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Nieprawidล‚owa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Podczas weryfikacji podpisu wystฤ…piล‚ bล‚ฤ…d. Nie zaktualizowano repozytorium i "
 "w dalszym ciฤ…gu bฤ™dฤ… uลผywane poprzednie pliki indeksu. Bล‚ฤ…d GPG %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Bล‚ฤ…d GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3107,7 +3150,7 @@ msgstr ""
 "Nie udaล‚o siฤ™ odnaleลบฤ‡ pliku dla pakietu %s. Moลผe to oznaczaฤ‡, ลผe trzeba "
 "bฤ™dzie rฤ™cznie naprawiฤ‡ ten pakiet (z powodu brakujฤ…cej architektury)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3116,38 +3159,38 @@ msgstr ""
 "Nie udaล‚o siฤ™ odnaleลบฤ‡ pliku dla pakietu %s. Moลผe to oznaczaฤ‡, ลผe trzeba "
 "bฤ™dzie rฤ™cznie naprawiฤ‡ ten pakiet."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pliki indeksu pakietรณw sฤ… uszkodzone. Brak pola Filename: dla pakietu %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Bล‚ฤ™dny rozmiar"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nie udaล‚o siฤ™ przeanalizowaฤ‡ pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Brak sekcji w pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Brak wpisu Hash w pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Nieprawidล‚owy wpis Valid-Until w pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nieprawidล‚owy wpis Date w pliku Release %s"
@@ -3175,7 +3218,7 @@ msgstr "Identyfikacja.. "
 msgid "Stored label: %s\n"
 msgstr "Etykieta: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Odmontowanie CD-ROM-u...\n"
 
@@ -3239,30 +3282,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopiowanie list pakietรณw..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Zapisywanie nowej listy ลบrรณdeล‚\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ลนrรณdล‚a dla tej pล‚yty to:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisano %i rekordรณw.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapisano %i rekordรณw z %i brakujฤ…cymi plikami.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapisano %i rekordรณw z %i niepasujฤ…cymi plikami\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapisano %i rekordรณw z %i brakujฤ…cymi plikami i %i niepasujฤ…cymi\n"
@@ -3277,17 +3320,6 @@ msgstr "Nie udaล‚o siฤ™ znaleลบฤ‡ wpisu uwierzytelnienia dla: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Bล‚ฤ™dna suma kontrolna dla: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Plik %s nie zaczyna siฤ™ wiadomoล›ciฤ… podpisanฤ… w trybie clearsign"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Brak zainstalowanej bazy kluczy w %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3364,115 +3396,115 @@ msgstr ""
 "Zewnฤ™trzny mechanizm rozwiฤ…zywania zaleลผnoล›ci zawiรณdล‚, bez podania "
 "prawidล‚owego komunikatu o bล‚ฤ™dzie"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Wykonywanie zewnฤ™trznego mechanizmu rozwiฤ…zywania zaleลผnoล›ci"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Caล‚kowite usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Proszฤ™ odnotowaฤ‡ znikniฤ™cie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Uruchamianie wyzwalacza post-installation %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nie udaล‚o siฤ™ otworzyฤ‡ pliku \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowywanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Pakiet %s zostaล‚ zainstalowany"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Przygotowywanie do usuniฤ™cia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Pakiet %s zostaล‚ usuniฤ™ty"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Przygotowywanie do caล‚kowitego usuniฤ™cia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pakiet %s zostaล‚ caล‚kowicie usuniฤ™ty"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nie moลผna zapisaฤ‡ dziennika, openpty() nie powiodล‚o siฤ™ (/dev/pts nie jest "
 "zamontowane?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Uruchamianie dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Operacja zostaล‚a przerwana, zanim mogล‚a zostaฤ‡ zakoล„czona"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Brak raportu programu apport, poniewaลผ osiฤ…gniฤ™to limit MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemy z zaleลผnoล›ciami - pozostawianie nieskonfigurowanego"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3480,7 +3512,7 @@ msgstr ""
 "Brak raportu programu apport, poniewaลผ komunikat bล‚ฤ™du wskazuje, ลผe "
 "przyczyna niepowodzenia leลผy w poprzednim bล‚ฤ™dzie."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3496,13 +3528,7 @@ msgstr ""
 "Brak raportu programu apport, poniewaลผ komunikat bล‚ฤ™du wskazuje na bล‚ฤ…d "
 "braku wolnej pamiฤ™ci"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3539,21 +3565,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "Niezablokowany"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Coล› niewล‚aล›ciwego staล‚o siฤ™ przy tล‚umaczeniu \"%s:%s\" (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Gotowe"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Podczas weryfikacji podpisu wystฤ…piล‚ bล‚ฤ…d. Nie zaktualizowano "
-#~ "repozytorium i w dalszym ciฤ…gu bฤ™dฤ… uลผywane poprzednie pliki indeksu. "
-#~ "Bล‚ฤ…d GPG %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Plik %s nie zaczyna siฤ™ wiadomoล›ciฤ… podpisanฤ… w trybie clearsign"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Pomijanie nieistniejฤ…cego pliku %s"
diff --git a/po/pt.po b/po/pt.po
index 053287494..620ee9c6f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -96,75 +96,75 @@ msgstr "Espaรงo total contabilizado: "
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s estรก dessincronizado."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nรฃo foi encontrado nenhum pacote"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Tem de fornecer pelo menos um padrรฃo de busca"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
 "showauto'."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nรฃo foi possรญvel encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A cache estรก dessincronizada, nรฃo pode x-referenciar um ficheiro de pacote"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nรฃo encontrado)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Marcaรงรฃo do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabela de Versรฃo:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,21 +235,29 @@ msgstr ""
 "tmp\n"
 "Para mais informaรงรตes veja as pรกginas do manual apt-cache(8) e apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Por favor indique um nome para este Disco, tal como 'Debian 5.0.3 Disco 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor insira um Disco no leitor e pressione enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falhou ao montar '%s' para '%s'"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este processo para o resto dos CDs no seu conjunto."
 
@@ -487,7 +495,7 @@ msgstr ""
 msgid "%s is already the newest version.\n"
 msgstr "%s jรก estรก na versรฃo mais recente.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s estรก definido para ser instalado manualmente.\n"
@@ -596,8 +604,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Apรณs esta operaรงรฃo, serรก libertado %sB de espaรงo em disco.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nรฃo foi possรญvel determinar o espaรงo livre em %s"
@@ -636,7 +644,7 @@ msgstr "Abortado."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
@@ -645,7 +653,7 @@ msgstr "Falhou obter %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
@@ -729,7 +737,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informaรงรฃo pode ajudar a resolver a situaรงรฃo:"
 
@@ -780,7 +788,7 @@ msgstr ""
 "Dependรชncias nรฃo satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma soluรงรฃo)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -792,33 +800,33 @@ msgstr ""
 "distribuiรงรฃo unstable em que alguns pacotes pedidos ainda nรฃo foram \n"
 "criados ou foram movidos do Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serรฃo instalados:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossรญvel encontrar o pacote %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s estรก definido para ser instalado automaticamente.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -826,46 +834,46 @@ msgstr ""
 "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' "
 "e 'apt-mark manual'."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualizaรงรฃo... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Impossรญvel criar acesso exclusivo ao directรณrio de downloads"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nรฃo conseguiu encontrar uma fonte para obter a versรฃo '%s' de '%s'"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "A obter %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Tem de especificar pelo menos um pacote para obter o cรณdigo fonte de"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nรฃo foi possรญvel encontrar um pacote de cรณdigo fonte para %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -875,7 +883,7 @@ msgstr ""
 "'%s' em:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -886,71 +894,71 @@ msgstr ""
 "bzr branch %s\n"
 "para obter as รบltimas actualizaรงรตes (possivelmente por lanรงar) ao pacote.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A saltar o ficheiro '%s', jรก tinha sido feito download'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Vocรช nรฃo possui espaรงo livre suficiente em %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ร‰ necessรกrio obter %sB/%sB de arquivos de cรณdigo fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ร‰ necessรกrio obter %sB de arquivos de cรณdigo fonte.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter cรณdigo fonte %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "A saltar a descompactaรงรฃo do pacote de cรณdigo fonte jรก descompactado em %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactaรงรฃo '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verifique se o pacote 'dpkg-dev' estรก instalado.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilaรงรฃo '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve especificar pelo menos um pacote para verificar as dependรชncias de "
 "compilaรงรฃo"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -959,18 +967,18 @@ msgstr ""
 "Nenhuma informaรงรฃo de arquitectura disponรญvel para %s. Para configuraรงรฃo "
 "veja apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Nรฃo foi possรญvel obter informaรงรตes de dependรชncias de compilaรงรฃo para %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nรฃo tem dependรชncias de compilaรงรฃo.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -979,7 +987,7 @@ msgstr ""
 "a dependรชncia de %s por %s nรฃo pode ser satisfeita porque %s nรฃo รฉ permitido "
 "em pacotes '%s'"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -988,14 +996,14 @@ msgstr ""
 "a dependรชncia de %s para %s nรฃo pรดde ser satisfeita porque o pacote %s nรฃo "
 "pรดde ser encontrado"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falha ao satisfazer a dependรชncia %s para %s: O pacote instalado %s รฉ "
 "demasiado novo"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1004,7 +1012,7 @@ msgstr ""
 "a dependรชncia de %s para %s nรฃo pode ser satisfeita porque a versรฃo "
 "candidata do pacote %s nรฃo pode satisfazer os requisitos de versรฃo"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1013,30 +1021,30 @@ msgstr ""
 "a dependรชncia de %s para %s nรฃo pode ser satisfeita porque o pacote %s nรฃo "
 "tem versรฃo candidata"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falha ao satisfazer a dependรชncia %s para %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nรฃo foi possรญvel satisfazer as dependรชncias de compilaรงรฃo para %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependรชncias de compilaรงรฃo"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changlog para %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรณdulos Suportados:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1126,7 +1134,7 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1201,7 +1209,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s jรก estava para nรฃo manter.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas nรฃo estava lรก"
@@ -1359,8 +1368,8 @@ msgstr "Foi atingido o tempo limite de ligaรงรฃo"
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligaรงรฃo"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1373,8 +1382,8 @@ msgid "Protocol corruption"
 msgstr "Corrupรงรฃo de protocolo"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Erro de escrita"
 
@@ -1428,7 +1437,7 @@ msgstr "Ligaรงรฃo de socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossรญvel aceitar ligaรงรฃo"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1455,89 +1464,102 @@ msgstr "Pesquisa"
 msgid "Unable to invoke "
 msgstr "Nรฃo foi possรญvel invocar "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "A Ligar a %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nรฃo foi possรญvel criar um socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nรฃo posso iniciar a ligaรงรฃo para %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nรฃo foi possรญvel ligar a %s:%s (%s), a conexรฃo expirou"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nรฃo foi possรญvel ligar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nรฃo foi possรญvel resolver '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporรกria a resolver '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nรฃo foi possรญvel ligar a %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura vรกlida, mas nรฃo foi possรญvel determinar a impressรฃo "
 "digital da chave?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura invรกlida foi encontrada."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nรฃo foi possรญvel executar 'gpgv' para verificar a assinatura  (o gpgv estรก "
 "instalado?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram invรกlidas:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1577,53 +1599,53 @@ msgstr "Este servidor HTTP possui suporte de range errado"
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "A selecรงรฃo falhou"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "O tempo da ligaรงรฃo expirou"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saรญda"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O lado remoto fechou a ligaรงรฃo"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Dados de cabeรงalho errados"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "A ligaรงรฃo falhou"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Erro interno"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nรฃo foi possรญvel ler %s"
@@ -1650,7 +1672,12 @@ msgstr "Nรฃo foi encontrado ficheiro de mirror '%s'"
 msgid "Can not read mirror file '%s'"
 msgstr "Nรฃo pode ler ficheiro de mirror '%s'"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nรฃo pode ler ficheiro de mirror '%s'"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Mirror: %s]"
@@ -1751,7 +1778,7 @@ msgstr ""
 "  -o=? Definir uma opรงรฃo arbitrรกria de configuraรงรฃo, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nรฃo conseguiu escrever para %s"
@@ -1897,8 +1924,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nรฃo foi possรญvel abrir o ficheiro %s da base de dados: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falha stat %s"
@@ -1911,87 +1938,87 @@ msgstr "O arquivo nรฃo tem registo de controlo"
 msgid "Unable to get a cursor"
 msgstr "Nรฃo foi possรญvel obter um cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Nรฃo foi possรญvel ler o directรณrio %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Nรฃo foi possรญvel fazer stat %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Os erros aplicam-se ao ficheiro "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Falhou resolver %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Falhou ao percorrer a รกrvore"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Falhou abrir %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Falhou o readlink %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Falhou o unlink %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Falhou ligar %s a %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arquivo nรฃo possuรญa campo package"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nรฃo possui entrada override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " o maintainer de %s รฉ %s, nรฃo %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nรฃo possui fonte de entrada de 'override'\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tambรฉm nรฃo possui entrada binรกria de 'override'\n"
@@ -2065,7 +2092,7 @@ msgstr "Falhou ler durante o cรกlculo de MD5"
 msgid "Problem unlinking %s"
 msgstr "Problema ao executar unlinking %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Falhou renomear %s para %s"
@@ -2123,23 +2150,23 @@ msgstr ""
 "  -o=? Definir uma opรงรฃo arbitrรกria de configuraรงรฃo, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Falhou a criaรงรฃo de pipes"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Falhou executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "A soma de controlo do tar falhou, arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeรงalho TAR %u desconhecido, membro %s"
@@ -2210,54 +2237,54 @@ msgstr "Falhou escrever o ficheiro %s"
 msgid "Failed to close file %s"
 msgstr "Falhou fechar o ficheiro %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "O caminho %s รฉ demasiado longo"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "A descompactar %s mais de uma vez"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O directรณrio %s รฉ desviado"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "O pacote estรก a tentar escrever no alvo de desvio %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio รฉ muito longo"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "O directรณrio %s estรก a ser substituรญdo por um nรฃo-directรณrio"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Falhou localizar o nรณ no seu hash bucket"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "O caminho รฉ demasiado longo"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Substituir o pacote correspondente sem versรฃo para %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "O ficheiro %s/%s substitui o que estรก no pacote %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nรฃo foi possรญvel fazer stat %s"
@@ -2339,30 +2366,30 @@ msgstr ""
 "estรก desabilitado pelo utilizador."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecรงรฃo %s nรฃo foi encontrada"
@@ -2435,6 +2462,16 @@ msgstr "%c%s... Erro !"
 msgid "%c%s... Done"
 msgstr "%c%s... Pronto"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Pronto"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2495,48 +2532,48 @@ msgstr "Impossรญvel executar stat ao cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "Problema ao fechar o ficheiro gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Nรฃo estรก a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nรฃo foi possรญvel abrir ficheiro de lock %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Nรฃo estรก a ser utilizado o acesso exclusivo para o ficheiro %s, montado via "
 "nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nรฃo foi possรญvel obter acesso exclusivo a %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 "Lista de ficheiros que nรฃo podem ser criados porque '%s' nรฃo รฉ um directรณrio"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "A ignorar '%s' no directรณrio '%s' porque nรฃo รฉ um ficheiro normal"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "A ignorar o ficheiro '%s' no directรณrio '%s' porque nรฃo tem extensรฃo no nome "
 "do ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2544,73 +2581,79 @@ msgstr ""
 "A ignorar o ficheiro '%s' no directรณrio '%s' porque tem uma extensรฃo "
 "invรกlida no nome do ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O sub-processo %s recebeu uma falha de segmentaรงรฃo."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O sub-processo %s recebeu o sinal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O sub-processo %s retornou um cรณdigo de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O sub-processo %s terminou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nรฃo foi possรญvel abrir ficheiro o %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nรฃo foi possรญvel abrir o descritor de ficheiro %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Falhou criar subprocesso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Falhou executar compactador "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lidos, ainda restam %llu para serem lidos mas nรฃo resta nenhum"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, ainda restam %llu para escrever mas nรฃo foi possรญvel"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema ao fechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema ao renomear o ficheiro %s para %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema ao remover o link do ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o ficheiro"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nenhum keyring instalado em %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazia"
@@ -2636,59 +2679,59 @@ msgstr "Este APT nรฃo suporta o sistema de versรตes '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "A cache de pacotes foi gerada para uma arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Prรฉ-Depende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Em Conflito"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "necessรกrio"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "padrรฃo"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2791,17 +2834,17 @@ msgstr "A abrir %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linha %u รฉ demasiado longa na lista de fontes %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "O tipo '%s' nรฃo รฉ conhecido na linha %u na lista de fontes %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2810,12 +2853,12 @@ msgstr ""
 "Nรฃo foi possรญvel proceder ร  configuraรงรฃo imediata em '%s'. Para detalhes, "
 "por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nรฃo pode configurar '%s'. "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2840,7 +2883,7 @@ msgstr ""
 "O pacote %s necessita ser reinstalado, mas nรฃo foi possรญvel encontrar um "
 "repositรณrio para o mesmo."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2848,13 +2891,13 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Nรฃo foi possรญvel corrigir problemas, vocรช tem pacotes mantidos (hold) "
 "estragados."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2862,7 +2905,7 @@ msgstr ""
 "Falhou o download de alguns ficheiros de รญndice. Foram ignorados ou os "
 "antigos foram usados em seu lugar."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta directรณrio de listas %spartial."
@@ -2899,18 +2942,18 @@ msgstr "O driver do mรฉtodo %s nรฃo pรดde ser encontrado."
 msgid "Method %s did not start correctly"
 msgstr "Mรฉtodo %s nรฃo iniciou correctamente"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' nรฃo รฉ suportado"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 "Nรฃo foi possรญvel determinar um tipo de sistema de empacotamento adequado"
@@ -2968,14 +3011,14 @@ msgstr "A cache possui um sistema de versรตes incompatรญvel"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Ocorreu um erro ao processar %s (%s%d)"
@@ -3001,27 +3044,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, vocรช excedeu o nรบmero de dependรชncias que este APT รฉ capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "O pacote %s %s nรฃo foi encontrado ao processar as dependรชncias de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nรฃo foi possรญvel executar stat ร  lista de pacotes de cรณdigo fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "A ler as listas de pacotes"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "A obter File Provides"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Erro de I/O ao gravar a cache de cรณdigo fonte"
 
@@ -3034,12 +3077,12 @@ msgstr "falhou renomear, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum nรฃo coincide"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Cรณdigo de verificaรงรฃo hash nรฃo coincide"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3048,18 +3091,18 @@ msgstr ""
 "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
 "errada em sources.list ou ficheiro malformado)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nรฃo foi possรญvel encontrar hash sum para '%s' no ficheiro Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Nรฃo existe qualquer chave pรบblica disponรญvel para as seguintes IDs de "
 "chave:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3068,15 +3111,15 @@ msgstr ""
 "O ficheiro Release para %s estรก expirado (invรกlido desde %s). Nรฃo serรฃo "
 "aplicadas as actualizaรงรตes para este repositรณrio."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuiรงรฃo em conflito: %s (esperado %s mas obtido %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Ocorreu um erro durante a verificaรงรฃo da assinatura. O repositรณrio nรฃo estรก "
@@ -3084,12 +3127,12 @@ msgstr ""
 "GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3099,7 +3142,7 @@ msgstr ""
 "significar que vocรช precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3108,7 +3151,7 @@ msgstr ""
 "Nรฃo foi possรญvel localizar arquivo para o pacote %s. Isto pode significar "
 "que vocรช precisa consertar manualmente este pacote."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3116,31 +3159,31 @@ msgstr ""
 "Os arquivos de รญndice de pacotes estรฃo corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nรฃo foi possรญvel fazer parse ao ficheiro Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Nenhuma secรงรฃo, no ficheiro Release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Nenhuma entrada hash no ficheiro Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Entrada invรกlida, 'Valid-until', no ficheiro de Release: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada, 'Date', invรกlida no ficheiro Release %s"
@@ -3168,7 +3211,7 @@ msgstr "A identificar.. "
 msgid "Stored label: %s\n"
 msgstr "Label Guardada: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "A desmontar o CD-ROM...\n"
 
@@ -3232,30 +3275,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "A copiar listas de pacotes..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "A escrever lista de novas source\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas de listas de Source para este Disco sรฃo:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Escreveu %i registos com %i ficheiros nรฃo coincidentes\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3272,17 +3315,6 @@ msgstr "Nรฃo foi possรญvel encontrar registo de autenticaรงรฃo para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash nรฃo coincide para: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "O ficheiro %s nรฃo comeรงa com uma mensagem assinada"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nenhum keyring instalado em %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3355,115 +3387,115 @@ msgstr "Preparar para receber soluรงรฃo"
 msgid "External solver failed without a proper error message"
 msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Executar resolvedor externo"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "A remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "A notar o desaparecimento de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A correr o 'trigger' de pรณs-instalaรงรฃo %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directรณrio '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nรฃo foi possรญvel abrir ficheiro o '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoรงรฃo de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoรงรฃo completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nรฃo รฉ possรญvel escrever o registo (log), openpty() falhou (/dev/pts nรฃo estรก "
 "montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "A correr o dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "A operaรงรฃo foi interrompida antes de poder terminar"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nenhum relatรณrio apport escrito pois MaxReports jรก foi atingido"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependรชncias - deixando por configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3471,7 +3503,7 @@ msgstr ""
 "Nenhum relatรณrio apport escrito pois a mensagem de erro indica que รฉ um erro "
 "de seguimento de um erro anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3487,16 +3519,7 @@ msgstr ""
 "Nenhum relatรณrio apport escrito pois a mensagem de erro indica um erro de "
 "memรณria esgotada"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nenhum relatรณrio apport escrito pois a mensagem de erro indica erro de disco "
-"cheio"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3533,21 +3556,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "Sem acesso exclusivo"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Pronto"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Ocorreu um erro durante a verificaรงรฃo da assinatura. O repositรณrio nรฃo "
-#~ "estรก actualizado e serรฃo utilizados os ficheiros anteriores de รญndice. "
-#~ "Erro do GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "O ficheiro %s nรฃo comeรงa com uma mensagem assinada"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "A saltar ficheiro %s inexistente"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 84554a950..2704aeb94 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -96,76 +96,75 @@ msgstr "Total de espaรงo contabilizado para: "
 msgid "Package file %s is out of sync."
 msgstr "O arquivo de pacote %s estรก fora de sincronia."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nenhum pacote encontrado"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Vocรช deve passar exatamente um padrรฃo"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
-"Este comando รฉ obsoleto. Por favor use 'apt-mark showauto' em vez disso."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossรญvel encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "O cache estรก fora de sincronia, nรฃo foi possรญvel fazer a referรชncia cruzada "
 "de um arquivo de pacote"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nรฃo encontrado)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabela de versรฃo:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,22 +239,30 @@ msgstr ""
 "tmp\n"
 "Veja as pรกginas de manual apt-cache(8) e apt.conf(5) para mais informaรงรตes.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Por favor, forneรงa um nome para este Disco, algo como 'Debian 2.1r1 Disco 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor, insira um Disco na unidade e pressione enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falhou ao renomear %s para %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repita este processo para o restante dos CDs em seu conjunto."
 
@@ -299,7 +306,7 @@ msgstr "S"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -454,7 +461,7 @@ msgstr "O pacote %s nรฃo tem candidato para instalaรงรฃo"
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Pacotes virtuais como '%s' nรฃo podem ser removidos\n"
+msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -492,7 +499,7 @@ msgstr "A reinstalaรงรฃo de %s nรฃo รฉ possรญvel, nรฃo pode ser baixado.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s jรก รฉ a versรฃo mais nova.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
@@ -602,8 +609,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Depois desta operaรงรฃo, %sB de espaรงo em disco serรฃo liberados.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nรฃo foi possรญvel determinar o espaรงo livre em %s"
@@ -642,7 +649,7 @@ msgstr "Abortar."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vocรช quer continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"
@@ -651,7 +658,7 @@ msgstr "Falhou ao buscar %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
@@ -687,12 +694,12 @@ msgstr[1] ""
 
 #: cmdline/apt-get.cc:1423
 msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: isto รฉ feito automaticamente pelo dpkg."
+msgstr ""
 
 #: cmdline/apt-get.cc:1561
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Ignorar indisponibilidade da versรฃo '%s' do pacote '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1593
 #, fuzzy, c-format
@@ -703,7 +710,7 @@ msgstr "Nรฃo foi possรญvel executar \"stat\" na lista de pacotes fonte %s"
 #: cmdline/apt-get.cc:1631
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Ignorar versรฃo indisponรญvel '%s' do pacote '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1647
 msgid "The update command takes no arguments"
@@ -731,7 +738,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "A informaรงรฃo a seguir pode ajudar a resolver a situaรงรฃo:"
 
@@ -788,7 +795,7 @@ msgstr ""
 "Dependรชncias desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma soluรงรฃo)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -800,184 +807,173 @@ msgstr ""
 "distribuiรงรฃo instรกvel, que alguns pacotes requeridos nรฃo foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serรฃo instalados:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossรญvel achar pacote %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Este comando รฉ obsoleto. Por favor use 'apt-mark auto' e 'apt-mark manual' "
-"em vez disso."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calculando atualizaรงรฃo... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Impossรญvel criar trava no diretรณrio de download"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Nรฃo foi possรญvel encontrar a fonte para baixar a versรฃo '%s' de '%s'"
+msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Baixando %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossรญvel encontrar um pacote fonte para %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"OBSERVAร‡รƒO: \\\"%s\\\" pacote mantido na versรฃo \\\"%s\\\" do sistema de "
-"controle em:\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Por favor, use:\n"
-"bzr branch %s\n"
-"para obter as atualizaรงรตes mais novas do pacote (possivelmente nรฃo "
-"lanรงado).\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo jรก baixado '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Vocรช nรฃo possui espaรงo livre suficiente em %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pulando o desempacotamento de fontes jรก desempacotados em %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Confira se o pacote 'dpkg-dev' estรก instalado.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construรงรฃo '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve-se especificar pelo menos um pacote para que se cheque as dependรชncias "
 "de construรงรฃo"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"Nenhum informaรงรฃo de arquitetura disponรญvel for %s. Veja apt.conf(5) APT:: "
-"Arquiteturas para configuraรงรฃo"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossรญvel conseguir informaรงรตes de dependรชncia de construรงรฃo para %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nรฃo tem dependรชncias de construรงรฃo.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -986,7 +982,7 @@ msgstr ""
 "a dependรชncia de %s por %s nรฃo pode ser satisfeita porque o pacote %s nรฃo "
 "pode ser encontrado"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -995,14 +991,14 @@ msgstr ""
 "a dependรชncia de %s por %s nรฃo pode ser satisfeita porque o pacote %s nรฃo "
 "pode ser encontrado"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falhou ao satisfazer a dependรชncia de %s por %s: Pacote instalado %s รฉ muito "
 "novo"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1011,7 +1007,7 @@ msgstr ""
 "a dependรชncia de %s por %s nรฃo pode ser satisfeita porque nenhuma versรฃo "
 "disponรญvel do pacote %s pode satisfazer os requerimentos de versรฃo"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1020,30 +1016,30 @@ msgstr ""
 "a dependรชncia de %s por %s nรฃo pode ser satisfeita porque o pacote %s nรฃo "
 "pode ser encontrado"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falhou ao satisfazer a dependรชncia de %s por %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nรฃo foi possรญvel satisfazer as dependรชncias de compilaรงรฃo para %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependรชncias de construรงรฃo"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรณdulos para os quais hรก suporte:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1131,17 +1127,13 @@ msgstr ""
 "para mais informaรงรตes e opรงรตes.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"NOTA: Esta รฉ apenas uma simulaรงรฃo!\n"
-"O apt-get precisa de privilรฉgios de root para uma execuรงรฃo real.\n"
-"Mantenha em mente que a trava estรก desativada,\n"
-"portanto nรฃo dependa da relevรขncia para a situaรงรฃo real atual!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1206,7 +1198,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s jรก รฉ a versรฃo mais nova.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este nรฃo estava lรก"
@@ -1223,7 +1216,7 @@ msgstr "Falhou ao abrir %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Execuรงรฃo do dpkg falhou. Vocรช รฉ o root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1246,27 +1239,6 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
-"Uso: apt-mark [options] {auto|manual} pacote1 [pacote2 ...]\n"
-"\n"
-"apt-mark รฉ uma interface simples de linha de comando para marcar\n"
-"pacotes como instalados manual ou automaticamente. Tambรฉm pode\n"
-"listar as marcas.\n"
-"\n"
-"Comandos:\n"
-"auto - Marca os pacotes como automaticamente instalados\n"
-"manual - Marca os pacotes como manualmente instalados\n"
-"\n"
-"Opรงรตes:\n"
-"-h Este texto de ajuda\n"
-"-q Registro de saรญda - sem indicador de progresso\n"
-"-qq Sem saรญda, a nรฃo ser para erros\n"
-"-s Sem aรงรฃo. Apenas imprime o que serรก feito.\n"
-"-f marcas de leitura/gravaรงรฃo auto/manual no arquivo dado\n"
-"-c=? Ler este arquivo de configuraรงรฃo\n"
-"-o=? Definir uma opรงรฃo de configuraรงรฃo arbitrรกria, exemplo -o dir::cache=/"
-"tmp\n"
-"Veja as pรกginas do manual do apt-mark(8) e do apt.conf(5) para mais "
-"informaรงรตes"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -1365,8 +1337,8 @@ msgstr "Conexรฃo expirou"
 msgid "Server closed the connection"
 msgstr "Servidor fechou a conexรฃo"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1379,8 +1351,8 @@ msgid "Protocol corruption"
 msgstr "Corrupรงรฃo de protocolo"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Erro de escrita"
 
@@ -1434,7 +1406,7 @@ msgstr "Conexรฃo do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossรญvel aceitar conexรฃo"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
@@ -1461,90 +1433,103 @@ msgstr "Pesquisa"
 msgid "Unable to invoke "
 msgstr "Impossรญvel invocar "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nรฃo foi possรญvel criar um socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nรฃo foi possรญvel iniciar a conexรฃo para %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nรฃo foi possรญvel conectar em %s:%s (%s), conexรฃo expirou"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nรฃo foi possรญvel conectar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nรฃo foi possรญvel resolver '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporรกria resolvendo '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossรญvel conectar em %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura boa, mas nรฃo foi possรญvel determinar a impressรฃo "
 "digital da chave?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura invรกlida foi encontrada."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nรฃo foi possรญvel executar '%s' para verificar a assinatura (o gpgv estรก "
 "instalado?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram invรกlidas:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1554,7 +1539,7 @@ msgstr ""
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "Arquivos vazios nรฃo sรฃo arquivos vรกlidos"
+msgstr ""
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1584,53 +1569,53 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Seleรงรฃo falhou"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Conexรฃo expirou"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saรญda"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexรฃo"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Dados de cabeรงalho ruins"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Conexรฃo falhou"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Erro interno"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossรญvel ler %s"
@@ -1648,7 +1633,7 @@ msgstr "Impossรญvel mudar para %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Nenhum arquivo de espelho \\\"%s\\\" encontrado "
+msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1657,10 +1642,15 @@ msgstr "Nenhum arquivo de espelho \\\"%s\\\" encontrado "
 msgid "Can not read mirror file '%s'"
 msgstr "Nรฃo foi possรญvel abrir arquivo %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nรฃo foi possรญvel abrir arquivo %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
-msgstr "[Espelho: %s]"
+msgstr ""
 
 #: methods/rred.cc:491
 #, c-format
@@ -1668,8 +1658,6 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
-"Nรฃo foi possรญvel atualizar %s com mmap e com o arquivo usado na operaรงรฃo - a "
-"atualizaรงรฃo parece estar corrompida."
 
 #: methods/rred.cc:496
 #, c-format
@@ -1677,8 +1665,6 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
-"Nรฃo foi possรญvel atualizar %s com mmap (mas nenhuma falha especรญfica do "
-"mmap) - a atualizaรงรฃo parece estar corrompida."
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
@@ -1760,7 +1746,7 @@ msgstr ""
 "  -o=? Define uma opรงรฃo de configuraรงรฃo arbitrรกria, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossรญvel escrever para %s"
@@ -1908,8 +1894,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossรญvel abrir o arquivo BD %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falhou ao executar \"stat\" %s"
@@ -1922,87 +1908,87 @@ msgstr "Repositรณrio nรฃo possui registro de controle"
 msgid "Unable to get a cursor"
 msgstr "Impossรญvel obter um cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Impossรญvel ler o diretรณrio %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Impossรญvel executar \"stat\" em %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Erros que se aplicam ao arquivo "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Falhou ao resolver %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Falhou ao percorrer a รกrvore"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Falhou ao abrir %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Falhou ao executar \"readlink\" %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Falhou ao executar \"unlink\" %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Falhou ao ligar %s a %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Repositรณrio nรฃo possuรญa campo pacote"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nรฃo possui entrada override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  mantenedor de %s รฉ %s, nรฃo %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nรฃo possui entrada override fonte\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tambรฉm nรฃo possui entrada override binรกria\n"
@@ -2076,7 +2062,7 @@ msgstr "Falhou ao ler durante o cรกlculo MD5"
 msgid "Problem unlinking %s"
 msgstr "Problema removendo %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Falhou ao renomear %s para %s"
@@ -2136,23 +2122,23 @@ msgstr ""
 "  -o=? Define uma opรงรฃo de configuraรงรฃo arbitrรกria, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Falhou ao criar \"pipes\""
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Falhou ao executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeรงalho TAR %u desconhecido, membro %s"
@@ -2223,54 +2209,54 @@ msgstr "Falhou ao escrever arquivo %s"
 msgid "Failed to close file %s"
 msgstr "Falhou ao fechar arquivo %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "O caminho %s รฉ muito longo"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempacotando %s mais de uma vez"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O diretรณrio %s รฉ desviado (\"diverted\")"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "O pacote estรก tentando escrever no alvo do desvio %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio รฉ muito longo"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "O diretรณrio %s estรก sendo substituรญdo por um nรฃo-diretรณrio"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Falha ao localizar nรณ em seu \"hash bucket\""
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "O caminho รฉ muito longo"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Sobrescrita de pacote nรฃo combina com nenhuma versรฃo para %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossรญvel executar \"stat\" em %s"
@@ -2335,8 +2321,6 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"MMap dinรขmico ficou sem espaรงo. Aumente o tamanho de APT::Cache-Start. Valor "
-"atual: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:440
 #, c-format
@@ -2344,41 +2328,37 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
-"Nรฃo รฉ possรญvel aumentar o tamanho do MMap pois o limite de %lu bytes jรก foi "
-"alcanรงado."
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Nรฃo รฉ possรญvel aumentar o tamanho do MMap pois o aumento automรกtico estรก "
-"desativado pelo usuรกrio."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Seleรงรฃo %s nรฃo encontrada"
@@ -2450,6 +2430,16 @@ msgstr "%c%s... Erro!"
 msgid "%c%s... Done"
 msgstr "%c%s... Pronto"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Pronto"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2511,115 +2501,120 @@ msgstr "Impossรญvel executar \"stat\" no cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nรฃo usando travamento para arquivo de trava somente leitura %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nรฃo foi possรญvel abrir arquivo de trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nรฃo usando travamento para arquivo de trava montado via nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nรฃo foi possรญvel obter trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Lista de aquivos nรฃo pode ser criada como '%s' nรฃo รฉ um diretรณrio"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorando '%s' no diretรณrio '%s' pois nรฃo รฉ um arquivo comum"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Ignorando '%s' no diretรณrio '%s' pois nรฃo tem extensรฃo de arquivo"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
-"Ignorando '%s' no diretรณrio '%s' pois tem uma extensรฃo de arquivo invรกlida"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-processo %s recebeu uma falha de segmentaรงรฃo."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Sub-processo %s recebeu uma falha de segmentaรงรฃo."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-processo %s retornou um cรณdigo de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-processo %s finalizou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nรฃo foi possรญvel abrir arquivo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nรฃo foi possรญvel abrir \"pipe\" para %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Falhou ao criar sub-processo IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Falhou ao executar compactador "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escrita, ainda restam %lu para gravar mas nรฃo foi possรญvel"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema sincronizando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema removendo o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o arquivo"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando instalaรงรฃo."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazio"
@@ -2646,59 +2641,59 @@ msgstr "Este APT nรฃo suporta o sistema de versรตes '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "O cache de pacotes foi gerado para uma arquitetura diferente"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Prรฉ-Depende"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Conflita"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Quebra"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
-msgstr "Aprimora"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "requerido"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "padrรฃo"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2803,31 +2798,29 @@ msgstr "Abrindo %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linha %u muito longa na lista de fontes %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' nรฃo รฉ conhecido na linha %u na lista de fontes %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"Nรฃo รฉ possรญvel executar imediatamente a configuraรงรฃo em '%s'. Por favor veja "
-"man 5 apt.conf em APT::Immediate-Configure para mais detalhes. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nรฃo foi possรญvel abrir arquivo %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2852,7 +2845,7 @@ msgstr ""
 "O pacote %s precisa ser reinstalado, mas nรฃo foi possรญvel encontrar um "
 "arquivo para o mesmo."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2860,11 +2853,11 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Impossรญvel corrigir problemas, vocรช manteve (hold) pacotes quebrados."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2873,7 +2866,7 @@ msgstr ""
 "Alguns arquivos de รญndice falharam para baixar, eles foram ignorados ou os "
 "antigos foram usados no lugar."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Diretรณrio de listas %spartial estรก faltando."
@@ -2910,18 +2903,18 @@ msgstr "O driver do mรฉtodo %s nรฃo pode ser encontrado."
 msgid "Method %s did not start correctly"
 msgstr "Mรฉtodo %s nรฃo iniciou corretamente"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' nรฃo รฉ suportado"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossรญvel determinar um tipo de sistema de empacotamento aplicรกvel."
 
@@ -2954,8 +2947,6 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
-"O valor '%s' รฉ invรกlido para APT::Default-Release como tal lanรงamento nรฃo "
-"estรก disponรญvel na origem"
 
 #: apt-pkg/policy.cc:399
 #, fuzzy, c-format
@@ -2978,14 +2969,14 @@ msgstr "O cache possui um sistema de versรตes incompatรญvel"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
@@ -3011,27 +3002,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, vocรช excedeu o nรบmero de dependรชncias que este APT รฉ capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pacote %s %s nรฃo foi encontrado enquanto processando dependรชncias de arquivo"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nรฃo foi possรญvel executar \"stat\" na lista de pacotes fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lendo listas de pacotes"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Coletando Arquivo \"Provides\""
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Erro de E/S ao gravar cache fonte"
 
@@ -3044,59 +3035,53 @@ msgstr "renomeaรงรฃo falhou, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
-"Nรฃo รฉ possรญvel encontrar entrada '%s' esperada no arquivo de Release "
-"(entrada incorreta em sources.list ou arquivo corrompido)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Impossรญvel analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nรฃo existem chaves pรบblicas para os seguintes IDs de chaves:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"Arquivo de lanรงamento para %s estรก expirado (invรกlido desde %s). "
-"Atualizaรงรตes desse repositรณrio nรฃo serรฃo aplicadas."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribuiรงรฃo em conflito: %s (esperado %s mas recebido %s)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
-"Um erro ocorreu durante a verificaรงรฃo da assinatura. O repositรณrio nรฃo foi "
-"atualizado eo รญndice anterior de arquivo serรก usado. Erro GPG: %s:%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr "Erro GPG: %s: %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,7 +3091,7 @@ msgstr ""
 "que vocรช precisa consertar manualmente este pacote. (devido a arquitetura "
 "nรฃo especificada)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3115,7 +3100,7 @@ msgstr ""
 "Nรฃo foi possรญvel localizar arquivo para o pacote %s. Isto pode significar "
 "que vocรช precisa consertar manualmente este pacote."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3123,31 +3108,31 @@ msgstr ""
 "Os arquivos de รญndice de pacotes estรฃo corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossรญvel analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Nota, selecionando %s ao invรฉs de %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr "Sem entradas hash no arquivo liberado %s"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Linha invรกlida no arquivo de desvios: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Impossรญvel analisar arquivo de pacote %s (1)"
@@ -3175,7 +3160,7 @@ msgstr "Identificando.. "
 msgid "Stored label: %s\n"
 msgstr "Rรณtulo armazenado: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando CD-ROM...\n"
 
@@ -3214,8 +3199,6 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
-"Nรฃo foi possรญvel localizar nenhum arquivo do pacote, talvez esse nรฃo seja um "
-"disco Debian ou a arquitetura esteja incorreta?"
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
@@ -3239,30 +3222,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copiando lista de pacotes..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Gravando nova lista de fontes\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Entradas na lista de fontes para este disco sรฃo:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Gravados %i registros com %i arquivos faltando.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Gravados %i registros com %i arquivos que nรฃo combinam\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3272,24 +3255,13 @@ msgstr ""
 #: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr "Nรฃo รฉ possรญvel encontrar o registro de autenticaรงรฃo para: %s"
+msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Arquivo %s nรฃo inicia com mensagem assinada simples"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortando instalaรงรฃo."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3314,7 +3286,6 @@ msgstr "Impossรญvel achar pacote %s"
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"Nรฃo se pode selecionar versรตes do pacote '%s' pois sรฃo puramente virtuais"
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3322,190 +3293,166 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
-"Nรฃo รฉ possรญvel selecionar ou instalar uma versรฃo candidata do pacote '%s' "
-"porque nรฃo existe nenhum deles."
 
 #: apt-pkg/cacheset.cc:555
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Nรฃo รฉ possรญvel selecionar a รบltima versรฃo do pacote '%s' pois รฉ simplesmente "
-"virtual."
 
 #: apt-pkg/cacheset.cc:563
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
-"Nรฃo รฉ possรญvel selecionar uma versรฃo candidata do pacote %s uma vez que nรฃo "
-"tem candidato"
 
 #: apt-pkg/cacheset.cc:571
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"Nรฃo รฉ possรญvel selecionar a versรฃo instalada do pacote %s pois ele nรฃo estรก "
-"instalado."
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr "Enviar estrutura para resolver"
+msgstr ""
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr "Enviar requisiรงรฃo para resolver"
+msgstr ""
 
 #: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
-msgstr "Preparando para receber soluรงรฃo"
+msgstr ""
 
 #: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
-msgstr "A soluรงรฃo externa falhou sem uma mensagem de erro adequada"
+msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
-msgstr "Executar soluรงรฃo externa"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr "Notado o desaparecimento de %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando gatilho pรณs-instalaรงรฃo %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretรณrio '%s' estรก faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nรฃo foi possรญvel abrir arquivo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparando para a remoรงรฃo de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparando para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Impossรญvel escrever log, openpty() falhou (/dev/pts nรฃo montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
-msgstr "Executando dpkg"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
-msgstr "Operaรงรฃo interrompida antes que pudesse terminar"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
-msgstr "Nenhum relatรณrio do apport gravado porque MaxReports jรก foi atingido"
+msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependรชncia - deixando desconfigurado"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
-"Nenhum relatรณrio do apport gravado porque a mensagem de erro indica รฉ o "
-"seguimento de um erro de uma falha anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
-"Nenhum relatรณrio do apport gravado porque a mensagem de erro indica um erro "
-"de disco cheio"
 
 #: apt-pkg/deb/dpkgpm.cc:1496
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
-"Sem relatรณrio apport escrito porque a mensagem de erro indicava um erro de "
-"falta de memรณria"
-
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nenhum relatรณrio apport gravado porque a mensagem de erro indica um problema "
-"no sistema local"
 
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
-"Nenhum relatรณrio do apport escrito porque a mensagem de erro indica um erro "
-"de entrada/saรญda (E/S) do dpkg"
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
@@ -3513,8 +3460,6 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
-"Nรฃo foi possรญvel travar o diretรณrio da administraรงรฃo (%s), tem outro "
-"processo o utilizando?"
 
 #: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
@@ -3528,20 +3473,10 @@ msgstr "Impossรญvel criar trava no diretรณrio de listas"
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"O dpkg foi interrompido, vocรช deve executar manualmente '%s' para corrigir o "
-"problema. "
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
-msgstr "Nรฃo bloqueado"
-
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Pronto"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Skipping nonexistent file %s"
diff --git a/po/ro.po b/po/ro.po
index 42ec2ab74..6399bee80 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petriศ™or <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -98,75 +98,74 @@ msgstr "Total spaศ›iu contorizat pentru: "
 msgid "Package file %s is out of sync."
 msgstr "Fiศ™ierul pachetului %s este desincronizat."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Nu s-au gฤƒsit pachete"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Trebuie sฤƒ daศ›i exact un ศ™ablon"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
-"Aceastฤƒ comandฤƒ este รฎnvechitฤƒ. Folosiศ›i รฎn schimb 'apt-mark showauto'."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nu s-a putut localiza pachetul %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Fiศ™iere pachet: "
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Cache-ul este desincronizat, nu se poate executa x-ref pe un fiศ™ier pachet"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(negฤƒsit)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Candideazฤƒ: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(niciunul)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pentru %s compilat la %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,21 +238,29 @@ msgstr ""
 "  -o=? Ajusteazฤƒ o opศ›iune de configurare arbitrarฤƒ, ex. -o dir::cache=/tmp\n"
 "Vedeศ›i manualele apt-cache(8) ศ™i apt.conf(5) pentru mai multe informaศ›ii.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Furnizaศ›i un nume pentru acest disc, de exemplu โ€žDebian 2.1r1 Disk 1โ€"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Introduceศ›i un disc รฎn unitate ศ™i apฤƒsaศ›i Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Eศ™ec la redenumirea lui %s รฎn %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetaศ›i aceastฤƒ procedurฤƒ pentru restul CD-urilor din set."
 
@@ -296,7 +303,7 @@ msgstr "Y"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -450,7 +457,7 @@ msgstr "Pachetul %s nu are nici un candidat la instalare"
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Pachetele virtuale ca '%s' nu pot fi eliminate\n"
+msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -488,7 +495,7 @@ msgstr "Reinstalarea lui %s nu este posibilฤƒ, nu poate fi descฤƒrcat.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s este deja la cea mai nouฤƒ versiune.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
@@ -596,8 +603,8 @@ msgstr "Dupฤƒ aceastฤƒ operaศ›ie vor fi folosiศ›i din disc รฎncฤƒ %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Dupฤƒ aceastฤƒ operaศ›ie se vor elibera %sB din spaศ›iul ocupat pe disc.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spaศ›iul disponibil รฎn %s"
@@ -637,7 +644,7 @@ msgstr "Renunศ›are."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vreศ›i sฤƒ continuaศ›i [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eศ™ec la aducerea lui %s  %s\n"
@@ -646,7 +653,7 @@ msgstr "Eศ™ec la aducerea lui %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Descฤƒrcarea unor fiศ™iere a eศ™uat"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Descฤƒrcare completฤƒ ศ™i รฎn modul doar descฤƒrcare"
 
@@ -688,7 +695,7 @@ msgstr ""
 #: cmdline/apt-get.cc:1561
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Ignorฤƒ obiectivele indisponibile ale versiunii '%s' din pachetul '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1593
 #, fuzzy, c-format
@@ -699,7 +706,7 @@ msgstr "Nu pot determina starea listei surse de pachete %s"
 #: cmdline/apt-get.cc:1631
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Ignorฤƒ versiunea indisponibilฤƒ '%s' a pachetului '%s'"
+msgstr ""
 
 #: cmdline/apt-get.cc:1647
 msgid "The update command takes no arguments"
@@ -729,7 +736,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Urmฤƒtoarele informaศ›ii ar putea sฤƒ vฤƒ ajute la rezolvarea situaศ›iei:"
 
@@ -787,7 +794,7 @@ msgstr ""
 "Dependenศ›e neรฎndeplinite. รŽncercaศ›i 'apt-get -f install' fฤƒrฤƒ nici un pachet "
 "(sau oferiศ›i o altฤƒ soluศ›ie)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -800,184 +807,174 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create รฎncฤƒ sau au fost mutate din Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Urmฤƒtoarele extra pachete vor fi instalate:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot gฤƒsi pachetul %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Aceastฤƒ comandฤƒ este รฎnvechitฤƒ. Folosiศ›i รฎn schimb 'apt-mark auto' ศ™i 'apt-"
-"mark manual'."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Calculez รฎnnoirea... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Eศ™ec"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Terminat"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internฤƒ, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descฤƒrcare"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Se descarcฤƒ %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Trebuie specificat cel puศ›in un pachet pentru a-i aduce sursa"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut gฤƒsi o sursฤƒ pachet pentru %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"NOTฤ‚: pachetul โ€ž%sโ€ este menลฃinut รฎn sistemul de control al versiunii โ€ž%sโ€ "
-"la:\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Folosiศ›i:\n"
-"bzr branch %s\n"
-"pentru obศ›inerea ultimelor (posibil nelansate) actualizฤƒri ale pachetului.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fiศ™ierul deja descฤƒrcat '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nu aveศ›i suficient spaศ›iu รฎn %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Este nevoie sฤƒ descฤƒrcaศ›i %sB/%sB din arhivele surselor.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Este nevoie sฤƒ descฤƒrcaศ›i %sB din arhivele surselor.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Eศ™ec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Sar peste despachetarea sursei deja despachetate รฎn %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eศ™uatฤƒ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificaศ›i dacฤƒ pachetul 'dpkg-dev' este instalat.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eศ™uatฤƒ.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Procesul copil a eศ™uat"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Trebuie specificat cel puศ›in un pachet pentru a-i verifica dependenศ›ele "
 "รฎnglobate"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"Nu este disponibilฤƒ nicio informaศ›ie despre arhitecturฤƒ pentru %s. Pentru "
-"configurare consultaศ›i apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nu pot prelua informaศ›iile despre dependenศ›ele รฎnglobate ale lui %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependenศ›e รฎnglobate.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -986,7 +983,7 @@ msgstr ""
 "Dependenศ›a lui %s de %s nu poate fi satisfฤƒcutฤƒ deoarece pachetul %s nu "
 "poate fi gฤƒsit"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -995,14 +992,14 @@ msgstr ""
 "Dependenศ›a lui %s de %s nu poate fi satisfฤƒcutฤƒ deoarece pachetul %s nu "
 "poate fi gฤƒsit"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Eศ™ec la satisfacerea dependenศ›ei %s pentru %s: Pachetul instalat %s este "
 "prea nou"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1011,7 +1008,7 @@ msgstr ""
 "Dependenศ›a lui %s de %s nu poate fi satisfฤƒcutฤƒ deoarece nici o versiune "
 "disponibilฤƒ a pachetului %s nu poate satisface versiunile cerute"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1020,30 +1017,30 @@ msgstr ""
 "Dependenศ›a lui %s de %s nu poate fi satisfฤƒcutฤƒ deoarece pachetul %s nu "
 "poate fi gฤƒsit"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Eศ™ec la satisfacerea dependenศ›ei %s pentru %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Dependenศ›ele รฎnglobate pentru %s nu pot fi satisfฤƒcute."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Eศ™ec la prelucrarea dependenศ›elor de compilare"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1132,17 +1129,13 @@ msgstr ""
 "pentru mai multe informaศ›ii ศ™i opศ›iuni.\n"
 "                       Acest APT are puterile unei Super Vaci.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"NOTฤ‚: Aceasta este doar o simulare!\n"
-"      apt-get necesitฤƒ privilegii root pentru o execuศ›ie realฤƒ.\n"
-"      Reศ›ineศ›i de asemenea cฤƒ blocarea este dezactivatฤƒ,\n"
-"      aศ™a ca nu depinde relevanศ›a situaลฃiei actuale reale!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1207,7 +1200,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s este deja la cea mai nouฤƒ versiune.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Aศ™teptat %s, dar n-a fost acolo"
@@ -1224,7 +1218,7 @@ msgstr "Eศ™ec la โ€žopenโ€ pentru %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Executarea dpkg a eศ™uat. Sunteศ›i root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1345,8 +1339,8 @@ msgstr "Timpul de conectare a expirat"
 msgid "Server closed the connection"
 msgstr "Serverul a รฎnchis conexiunea"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Eroare de citire"
 
@@ -1359,8 +1353,8 @@ msgid "Protocol corruption"
 msgstr "Protocol corupt"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Eroare de scriere"
 
@@ -1416,7 +1410,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problemฤƒ la calcularea dispersiei pentru fiศ™ierul"
 
@@ -1443,90 +1437,103 @@ msgstr "Interogare"
 msgid "Unable to invoke "
 msgstr "Nu s-a putut invoca"
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nu s-a putut iniศ›ia conexiunea cu %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nu s-a putut rezolva โ€ž%sโ€"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Eศ™ec temporar la rezolvarea lui โ€ž%sโ€"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "S-a รฎntรขmplat ceva โ€žnecuratโ€ la rezolvarea lui โ€ž%s:%sโ€ (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "S-a รฎntรขmplat ceva โ€žnecuratโ€ la rezolvarea lui โ€ž%s:%sโ€ (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Eroare internฤƒ: Semnฤƒturฤƒ corespunzฤƒtoare, dar nu s-a putut determina "
 "amprenta digitale a cheii?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Cel puศ›in o semnฤƒturฤƒ nevalidฤƒ a fost รฎntรขlnitฤƒ."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nu s-a putut executa โ€ž%sโ€ pentru verificarea semnฤƒturii (gpgv este instalat?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscutฤƒ รฎn timp ce se executฤƒ gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Urmฤƒtoarele semnฤƒturi nu au fost valide:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1536,7 +1543,7 @@ msgstr ""
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "Fiศ™ierele goale nu pot fi arhive valide"
+msgstr ""
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1566,54 +1573,54 @@ msgstr "Acest server HTTP are un suport defect de intervale"
 msgid "Unknown date format"
 msgstr "Format datฤƒ necunoscut"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Selecศ›ia a eศ™uat"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fiศ™ierului de rezultat"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Eroare la scrierea รฎn fiศ™ier"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea รฎn fiศ™ierul"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Eroare la citirea de la server. Conexiunea a fost รฎnchisฤƒ de la distanศ›ฤƒ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Antet de date necorespunzฤƒtor"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Conectare eศ™uatฤƒ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Eroare internฤƒ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
@@ -1631,7 +1638,7 @@ msgstr "Nu pot schimba la %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Nu a fost gฤƒsit niciun fiศ™ier oglindฤƒ โ€ž%sโ€ "
+msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1640,10 +1647,15 @@ msgstr "Nu a fost gฤƒsit niciun fiศ™ier oglindฤƒ โ€ž%sโ€ "
 msgid "Can not read mirror file '%s'"
 msgstr "Nu s-a putut deschide fiศ™ierul %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nu s-a putut deschide fiศ™ierul %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
-msgstr "[Oglindฤƒ: %s]"
+msgstr ""
 
 #: methods/rred.cc:491
 #, c-format
@@ -1651,8 +1663,6 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
-"Nu se poate completa %s cu mmap ศ™i cu utilizarea operaศ›iilor din fiศ™ier - "
-"patch-ul pare a fi corupt."
 
 #: methods/rred.cc:496
 #, c-format
@@ -1660,8 +1670,6 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
-"Nu se poate completa %s cu mmap (dar nu este specificatฤƒ nicio eroare "
-"specificฤƒ mmap) - patch-ul pare a fi corupt."
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
@@ -1739,7 +1747,7 @@ msgstr ""
 "  -c=? Citeศ™te acest fiศ™ier de configurare\n"
 "  -o=? Ajusteazฤƒ o opศ›iune de configurare arbitrarฤƒ, ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nu s-a putut scrie รฎn %s"
@@ -1893,8 +1901,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nu s-a putut deschide fiศ™ierul DB %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Eศ™ec la โ€žstatโ€ pentru %s"
@@ -1907,87 +1915,87 @@ msgstr "Arhiva nu are รฎnregistrare de control"
 msgid "Unable to get a cursor"
 msgstr "Nu s-a putut obศ›ine un cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Nu s-a putut citi directorul %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Nu s-a putut efectua โ€žstatโ€ pentru %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Erori la fiศ™ierul "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Eศ™ec la โ€žresolveโ€ pentru %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Parcurgerea arborelui a eศ™uat"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Eศ™ec la โ€žopenโ€ pentru %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Dezlegare %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Eศ™ec la โ€žreadlinkโ€ pentru %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Eศ™ec la โ€žunlinkโ€ pentru %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Eศ™ec la โ€žlinkโ€ รฎntre %s ศ™i %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Limita de %sB a dezlegฤƒrii a fost atinsฤƒ.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arhiva nu are cรขmp de pachet"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nu are intrare de รฎnlocuire\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s responsabil este %s nu %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nu are nici o intrare sursฤƒ de รฎnlocuire\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nu are nici intrare binarฤƒ de รฎnlocuire\n"
@@ -2061,7 +2069,7 @@ msgstr "Eศ™ec la citire รฎn timpul calculului sumei MD5"
 msgid "Problem unlinking %s"
 msgstr "Problemฤƒ la desfacerea %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Eศ™ec la redenumirea lui %s รฎn %s"
@@ -2120,24 +2128,24 @@ msgstr ""
 "  -o=? Ajusteazฤƒ o opศ›iune de configurare arbitrarฤƒ, ex.: -o dir::cache=/"
 "tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Eศ™ec la crearea conexiunilor"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Eศ™ec la executarea lui gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Arhivฤƒ deterioratฤƒ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 "Suma de control a arhivei tar nu s-a verificat, arhiva este deterioratฤƒ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tip antet TAR %u necunoscut, membrul %s"
@@ -2209,55 +2217,55 @@ msgstr "Eศ™ec la scrierea fiศ™ierului %s"
 msgid "Failed to close file %s"
 msgstr "Eศ™ec la รฎnchiderea fiศ™ierului %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Calea %s este prea lungฤƒ"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Se despacheteazฤƒ %s de mai multe ori"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Directorul %s este redirectat"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Pachetul รฎncearcฤƒ sฤƒ scrie รฎn ศ›inta redirectฤƒrii %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Calea de redirectare este prea lungฤƒ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Directorul %s este รฎnlocuit de un non-director"
 
 # XXX: nu-mi place, hash bucket ar trebui tradus mai elegant
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Eศ™ec la localizarea nodului รฎn clasa lui din tabela de dispersie"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Calea este prea lungฤƒ"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pachet suprascris fฤƒrฤƒ nici o versiune pentru %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Fiศ™ierul %s/%s รฎl suprascrie pe cel din pachetul %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nu se poate executa โ€žstatโ€ pe %s"
@@ -2330,41 +2338,37 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
-"Nu s-a putut mฤƒri dimensiunea MMap pentru cฤƒ limita de %lu de octeศ›i e deja "
-"atinsฤƒ."
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Nu s-a putut mฤƒri dimensiunea MMap pentru cฤƒ redimensionarea automatฤƒ a fost "
-"dezactivatฤƒ de utilizator."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecศ›ia %s nu a fost gฤƒsitฤƒ"
@@ -2436,6 +2440,16 @@ msgstr "%c%s... Eroare!"
 msgid "%c%s... Done"
 msgstr "%c%s... Terminat"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Terminat"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2497,115 +2511,120 @@ msgstr "Eศ™ec la โ€žstatโ€ pentru CD"
 msgid "Problem closing the gzip file %s"
 msgstr "Problemฤƒ la รฎnchiderea fiศ™ierului"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nu s-a folosit รฎnchiderea pentru fiศ™ierul disponibil doar-citire %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nu pot deschide fiศ™ierul blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nu este folosit blocajul pentru fiศ™ierul montat nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nu pot determina blocajul %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Nu se poate crea lista de fiศ™iere pentru cฤƒ '%s' nu e un director"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Se ignorฤƒ '%s' รฎn directorul '%s' pentru cฤƒ nu e fiศ™ier obiศ™nuit"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "Se ignorฤƒ fiศ™ierul '%s' din directorul '%s' pentru cฤƒ nu are extensie"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
-"Se ignorฤƒ fiศ™ierul '%s' din directorul '%s' pentru cฤƒ are extensie nevalidฤƒ"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subprocesul %s a รฎntors un cod de eroare (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subprocesul %s s-a terminat brusc"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nu s-a putut deschide fiศ™ierul %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Eศ™ec la crearea IPC-ului pentru subproces"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Eศ™ec la executarea compresorului"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "citire, รฎncฤƒ mai am %lu de citit dar n-a mai rฤƒmas nimic"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "scriere, รฎncฤƒ mai am %lu de scris dar nu pot"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problemฤƒ la รฎnchiderea fiศ™ierului"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problemฤƒ รฎn timpul sincronizฤƒrii fiศ™ierului"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problemฤƒ la dezlegarea fiศ™ierului"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problemฤƒ รฎn timpul sincronizฤƒrii fiศ™ierului"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache gol de pachet"
@@ -2632,59 +2651,59 @@ msgstr "Acest APT nu suportฤƒ versioning system '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "Cache-ul pachetului a fost construit pentru o arhitecturฤƒ diferitฤƒ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Depinde"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Sugereazฤƒ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Recomandฤƒ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Este รฎn conflict"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "รŽnlocuieศ™te"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "รŽnvechit"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Corupe"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
-msgstr "รŽmbunฤƒtฤƒศ›eศ™te"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "cerut"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "opศ›ional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2784,31 +2803,29 @@ msgstr "Deschidere %s"
 msgid "Line %u too long in source list %s."
 msgstr "Linia %u prea lungฤƒ รฎn lista sursฤƒ %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Linie greศ™itฤƒ %u รฎn lista sursฤƒ %s (tip)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipul '%s' nu este cunoscut รฎn linia %u din lista sursฤƒ %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"Nu se poate realiza o configurare imediatฤƒ pentru โ€ž%sโ€. Pentru mai multe "
-"detalii consultaศ›i man 5 apt.conf din  APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nu s-a putut deschide fiศ™ierul %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2832,7 +2849,7 @@ msgid ""
 msgstr ""
 "Pachetul %s are nevoie sฤƒ fie reinstalat, dar nu pot gฤƒsi o arhivฤƒ pentru el."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2840,11 +2857,11 @@ msgstr ""
 "Eroare, pkgProblemResolver::Resolve a generat รฎntreruperi, aceasta poate fi "
 "cauzatฤƒ de pachete ศ›inute."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, aศ›i ศ›inut pachete deteriorate."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2853,7 +2870,7 @@ msgstr ""
 "Descฤƒrcarea unor fiศ™iere index a eศ™uat, acestea fie au fost ignorate, fie au "
 "fost folosite รฎn loc unele vechi."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Directorul de liste %spartial lipseศ™te."
@@ -2890,18 +2907,18 @@ msgstr "Metoda driver %s nu poate fi gฤƒsitฤƒ."
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nu s-a lansat corect"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Vฤƒ rog introduceศ›i discul numit: '%s' รฎn unitatea '%s' ศ™i apฤƒsaศ›i Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistemul de pachete '%s' nu este suportat"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nu s-a putut determina un tip de sistem de รฎmpachetare potrivit"
 
@@ -2935,8 +2952,6 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
-"Valoarea โ€ž%sโ€ nu este una validฤƒ pentru APT::Default-Release, รฎntrucรขt o "
-"astfel de versiune nu este disponibilฤƒ รฎn surse."
 
 #: apt-pkg/policy.cc:399
 #, fuzzy, c-format
@@ -2959,14 +2974,14 @@ msgstr "Cache are un versioning system incompatibil"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Eroare apฤƒrutฤƒ รฎn timpul procesฤƒrii %s (FindPkg)"
@@ -2992,27 +3007,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Mamฤƒฤƒฤƒ, aศ›i depฤƒศ™it numฤƒrul de dependenศ›e de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Nu s-a gฤƒsit pachetul %s %s รฎn timpul procesฤƒrii dependenศ›elor de fiศ™iere"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Citire liste de pachete"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Colectare furnizori fiศ™ier"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Eroare IO รฎn timpul salvฤƒrii sursei cache"
 
@@ -3025,61 +3040,55 @@ msgstr "redenumire eศ™uatฤƒ, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Nepotrivire MD5Sum"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Nepotrivire la suma de cฤƒutare"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
-"Nu se poate gฤƒsi intrarea aศ™teptatฤƒ โ€ž%sโ€ รฎn fiศ™ierul Release (intrare "
-"greศ™itฤƒ รฎn sources.list sau linie coruptฤƒ)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nu s-a putut analiza fiศ™ierul pachet %s (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Nu existฤƒ nici o cheie publicฤƒ disponibilฤƒ pentru urmฤƒtoarele "
 "identificatoare de chei:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"Fiศ™ierul Release pentru %s este expirat (nevalid de %s). Actualizฤƒrile "
-"pentru acest depozit nu vor fi aplicate."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribuศ›ie รฎn conflict: %s (se aศ™tepta %s dar s-a primit %s)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
-"A apฤƒrut o eroare la verificarea semnฤƒturii. Depozitul de programe nu este "
-"actualizat, aศ™a cฤƒ va fi utilizat indexul precedent. Eroare GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr "Eroare GPG: %s: %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3088,7 +3097,7 @@ msgstr ""
 "N-am putut localiza un fiศ™ier pentru pachetul %s. Aceasta ar putea รฎnsemna "
 "cฤƒ aveศ›i nevoie sฤƒ reparaศ›i manual acest pachet (din pricina unui arch lipsฤƒ)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3097,7 +3106,7 @@ msgstr ""
 "N-am putut localiza un fiศ™ier pentru pachetul %s. Aceasta ar putea รฎnsemna "
 "cฤƒ aveศ›i nevoie sฤƒ depanaศ›i manual acest pachet."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3105,31 +3114,31 @@ msgstr ""
 "Fiศ™ierele index de pachete sunt deteriorate. Fฤƒrฤƒ cรขmpul 'nume fiศ™ier:' la "
 "pachetul %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nu s-a putut analiza fiศ™ierul pachet %s (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Notฤƒ, se selecteazฤƒ %s รฎn locul lui %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr "Nicio sumฤƒ de control รฎn fiศ™ierul Release %s"
+msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Linie necorespunzฤƒtoare รฎn fiศ™ierul-redirectare: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nu s-a putut analiza fiศ™ierul pachet %s (1)"
@@ -3157,7 +3166,7 @@ msgstr "Identificare.. "
 msgid "Stored label: %s\n"
 msgstr "Etichetฤƒ memoratฤƒ: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Se demonteazฤƒ CD-ul...\n"
 
@@ -3197,8 +3206,6 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
-"Nu se pot localiza niciun fiศ™ier pachet, este posibil ca acest disc sฤƒ nu "
-"fie un disc Debian sau sฤƒ aveศ›i o arhitecturฤƒ greศ™itฤƒ?"
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
@@ -3222,30 +3229,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Copiez listele de pachete.."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Scriere noua listฤƒ sursฤƒ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Intrฤƒrile listei surselor pentru acest disc sunt:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S-au scris %i รฎnregistrฤƒri.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S-au scris %i รฎnregistrฤƒri cu %i fiศ™iere lipsฤƒ.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S-au scris %i รฎnregistrฤƒri cu %i fiศ™iere nepotrivite\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3254,24 +3261,13 @@ msgstr ""
 #: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr "Nu se poate gฤƒsi รฎnregistrarea de autentificare pentru: %s"
+msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Nepotrivire la suma de cฤƒutare"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Fiศ™ierul %s nu porneศ™te cu un mesaj semnat clar"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abandonez instalarea."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3296,7 +3292,6 @@ msgstr "Nu pot gฤƒsi pachetul %s"
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"Nu se pot selecta versiunile din pachetul โ€ž%sโ€ deoarece este unul pur virtual"
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3304,192 +3299,167 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
-"Nu se poate selecta nicio versiune instalatฤƒ sau candidat din pachetul โ€ž%sโ€ "
-"deoarece nu conศ›ine astfel de fiศ™ere"
 
 #: apt-pkg/cacheset.cc:555
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"Nu se poate selecta o versiune mai nouฤƒ din pachetul โ€ž%sโ€ deoarece este unul "
-"pur virtual"
 
 #: apt-pkg/cacheset.cc:563
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
-"Nu se poate selecta versiunea candidat din pachetul %s deoarece nu conศ›ine "
-"niciun candidat"
 
 #: apt-pkg/cacheset.cc:571
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"Nu se poate selecta versiunea instalatฤƒ din pachetul %s deoarece nu este "
-"instalat"
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr "Trimite scenariul la rezolvator"
+msgstr ""
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr "Trimite cererea la rezolvator"
+msgstr ""
 
 #: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
-msgstr "Se pregฤƒteศ™te pentru primirea soluศ›iei"
+msgstr ""
 
 #: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
-msgstr "Rezolvatorul extern a eศ™uat fฤƒrฤƒ un mesaj de eroare potrivit"
+msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
-msgstr "Executฤƒ rezolvatorul extern"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Se instaleazฤƒ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Se configureazฤƒ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Se ศ™terge %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "ศ˜ters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr "Se ia notฤƒ de dispariศ›ia lui %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Se ruleazฤƒ declanศ™atorul post-instalare %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul โ€ž%sโ€ lipseศ™te."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nu s-a putut deschide fiศ™ierul %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregฤƒteศ™te %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despacheteazฤƒ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Se pregฤƒteศ™te configurarea %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Se pregฤƒteศ™te ศ™tergerea lui %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ศ˜ters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Se pregฤƒteศ™te ศ™tergerea completฤƒ a %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "ศ˜ters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nu se poate scrie jurnalul, openpty() a eศ™uat (oare /dev/pts e montat?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
-msgstr "Se porneศ™te dpkg"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
-msgstr "Operaศ›ia a fost รฎntreruptฤƒ รฎnainte de a fi terminatฤƒ"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
-"Nu existฤƒ un raport apport deoarece limita MaxReports a fost deja atinsฤƒ"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
-msgstr "probleme de dependenศ›e - se lasฤƒ neconfigurat"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
-"Nu a fost scris niciun raport apport deoarece mesajul de eroare indicฤƒ o "
-"eroare survenitฤƒ รฎn urma unei erori precedente."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
-"Nu a fost scris niciun raport apport deoarece mesajul de eroare indicฤƒ o "
-"eroare referitoare la disc plin"
 
 #: apt-pkg/deb/dpkgpm.cc:1496
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
-"Nu a fost scris niciun raport apport deoarece mesajul de eroare indicฤƒ o "
-"eroare referitoare la memorie insuficientฤƒ"
-
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nu a fost scris niciun raport apport deoarece mesajul de eroare indicฤƒ o "
-"eroare referitoare la o problemฤƒ de pe sistemul local"
 
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
-"Nu a fost scris niciun raport apport deoarece mesajul de eroare indicฤƒ o "
-"eroare I/O dpkg"
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
@@ -3497,8 +3467,6 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
-"Nu se poate bloca dosarul de administrare (%s), este oare utilizat de un alt "
-"proces?"
 
 #: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
@@ -3512,20 +3480,10 @@ msgstr "Nu pot รฎncuia directorul cu lista"
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"dpkg a fost รฎntrerupt, pentru a corecta problema trebuie sฤƒ rulaศ›i manual "
-"โ€ž%sโ€. "
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
-msgstr "Nu este blocat"
-
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "S-a รฎntรขmplat ceva โ€žnecuratโ€ la rezolvarea lui โ€ž%s:%sโ€ (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Terminat"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Skipping nonexistent file %s"
diff --git a/po/ru.po b/po/ru.po
index b94da0a46..fee0aaa8c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt rev2227.1.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-30 08:47+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -104,72 +104,72 @@ msgstr "ะŸะพะปะฝะพะต ัƒั‡ั‚ั‘ะฝะฝะพะต ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะพ: "
 msgid "Package file %s is out of sync."
 msgstr "ะกะฟะธัะพะบ ะฟะฐะบะตั‚ะพะฒ %s ั€ะฐััะธะฝั…ั€ะพะฝะธะทะธั€ะพะฒะฐะฝ."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ะะต ะฝะฐะนะดะตะฝะพ ะฝะธ ะพะดะฝะพะณะพ ะฟะฐะบะตั‚ะฐ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "ะ’ั‹ ะดะพะปะถะฝั‹ ะทะฐะดะฐั‚ัŒ ะฝะต ะผะตะฝะตะต ะพะดะฝะพ ัˆะฐะฑะปะพะฝะฐ ะฟะพะธัะบะฐ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "ะญั‚ะฐ ะบะพะผะฐะฝะดะฐ ัƒัั‚ะฐั€ะตะปะฐ. ะ˜ัะฟะพะปัŒะทัƒะนั‚ะต ะฒะผะตัั‚ะพ ะฝะตั‘ ยซapt-mark showautoยป."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฝะฐะนั‚ะธ ะฟะฐะบะตั‚ %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ะกะฟะธัะบะธ ะฟะฐะบะตั‚ะพะฒ:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ะšััˆ ั€ะฐััะธะฝั…ั€ะพะฝะธะทะธั€ะพะฒะฐะฝ, ะฝะตะฒะพะทะผะพะถะฝะพ ะพะฑะฝะฐั€ัƒะถะธั‚ัŒ ััั‹ะปะบัƒ ะฝะฐ ัะฟะธัะพะบ ะฟะฐะบะตั‚ะพะฒ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ะ—ะฐั„ะธะบัะธั€ะพะฒะฐะฝะฝั‹ะต ะฟะฐะบะตั‚ั‹:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ะฝะต ะฝะฐะนะดะตะฝะพ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ะฃัั‚ะฐะฝะพะฒะปะตะฝ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ะšะฐะฝะดะธะดะฐั‚: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ะพั‚ััƒั‚ัั‚ะฒัƒะตั‚)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ะคะธะบัะฐั‚ะพั€ ะฟะฐะบะตั‚ะฐ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ะขะฐะฑะปะธั†ะฐ ะฒะตั€ัะธะน:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ะดะปั %s ัะบะพะผะฟะธะปะธั€ะพะฒะฐะฝ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,20 +239,28 @@ msgstr ""
 "  -o=? ะ—ะฐะดะฐั‚ัŒ ะทะฝะฐั‡ะตะฝะธะต ะฟั€ะพะธะทะฒะพะปัŒะฝะพะน ะฝะฐัั‚ั€ะพะนะบะธ, ะฝะฐะฟั€ะธะผะตั€, -o dir::cache=/tmp\n"
 "ะŸะพะดั€ะพะฑะฝะพัั‚ะธ ะฒ ัะฟั€ะฐะฒะพั‡ะฝั‹ั… ัั‚ั€ะฐะฝะธั†ะฐั… apt-cache(8) ะธ apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "ะ—ะฐะดะฐะนั‚ะต ะธะผั ะดะปั ัั‚ะพะณะพ ะดะธัะบะฐ, ะฝะฐะฟั€ะธะผะตั€ ยซDebian 5.0.3 Disk 1ยป"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ะ’ัั‚ะฐะฒัŒั‚ะต ะดะธัะบ ะฒ ัƒัั‚ั€ะพะนัั‚ะฒะพ ะธ ะฝะฐะถะผะธั‚ะต ะฒะฒะพะด"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟั€ะธะผะพะฝั‚ะธั€ะพะฒะฐั‚ัŒ ยซ%sยป ะบ ยซ%sยป"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ะŸะพะฒั‚ะพั€ะธั‚ะต ัั‚ะพั‚ ะฟั€ะพั†ะตัั ะดะปั ะฒัะตั… ะธะผะตัŽั‰ะธั…ัั CD."
 
@@ -490,7 +498,7 @@ msgstr "ะŸะตั€ะตัƒัั‚ะฐะฝะพะฒะบะฐ %s ะฝะตะฒะพะทะผะพะถะฝะฐ, ะพะฝ ะฝะต ัะบะฐั‡ะธ
 msgid "%s is already the newest version.\n"
 msgstr "ะฃะถะต ัƒัั‚ะฐะฝะพะฒะปะตะฝะฐ ัะฐะผะฐั ะฝะพะฒะฐั ะฒะตั€ัะธั %s.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ัƒัั‚ะฐะฝะพะฒะปะตะฝ ะฒั€ัƒั‡ะฝัƒัŽ.\n"
@@ -605,8 +613,8 @@ msgstr ""
 "ะŸะพัะปะต ะดะฐะฝะฝะพะน ะพะฟะตั€ะฐั†ะธะธ, ะพะฑัŠั‘ะผ ะทะฐะฝัั‚ะพะณะพ ะดะธัะบะพะฒะพะณะพ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะฐ ัƒะผะตะฝัŒัˆะธั‚ัั ะฝะฐ "
 "%sB.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพะฟั€ะตะดะตะปะธั‚ัŒ ะบะพะปะธั‡ะตัั‚ะฒะพ ัะฒะพะฑะพะดะฝะพะณะพ ะผะตัั‚ะฐ ะฒ %s"
@@ -647,7 +655,7 @@ msgstr "ะะฒะฐั€ะธะนะฝะพะต ะทะฐะฒะตั€ัˆะตะฝะธะต."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ะฅะพั‚ะธั‚ะต ะฟั€ะพะดะพะปะถะธั‚ัŒ [ะ”/ะฝ]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟะพะปัƒั‡ะธั‚ัŒ %s  %s\n"
@@ -656,7 +664,7 @@ msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟะพะปัƒั‡ะธั‚ัŒ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "ะะตะบะพั‚ะพั€ั‹ะต ั„ะฐะนะปั‹ ัะบะฐั‡ะฐั‚ัŒ ะฝะต ัƒะดะฐะปะพััŒ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ะฃะบะฐะทะฐะฝ ั€ะตะถะธะผ ยซั‚ะพะปัŒะบะพ ัะบะฐั‡ะธะฒะฐะฝะธะตยป, ะธ ัะบะฐั‡ะธะฒะฐะฝะธะต ะทะฐะฒะตั€ัˆะตะฝะพ"
 
@@ -743,7 +751,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ะกะปะตะดัƒัŽั‰ะฐั ะธะฝั„ะพั€ะผะฐั†ะธั, ะฒะพะทะผะพะถะฝะพ, ะฟะพะผะพะถะตั‚ ะฒะฐะผ:"
 
@@ -797,7 +805,7 @@ msgstr ""
 "ะะตัƒะดะพะฒะปะตั‚ะฒะพั€ั‘ะฝะฝั‹ะต ะทะฐะฒะธัะธะผะพัั‚ะธ. ะŸะพะฟั‹ั‚ะฐะนั‚ะตััŒ ะฒั‹ะฟะพะปะฝะธั‚ัŒ ยซapt-get -f installยป, "
 "ะฝะต ัƒะบะฐะทั‹ะฒะฐั ะธะผะตะฝะธ ะฟะฐะบะตั‚ะฐ, (ะธะปะธ ะฝะฐะนะดะธั‚ะต ะดั€ัƒะณะพะต ั€ะตัˆะตะฝะธะต)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -808,33 +816,33 @@ msgstr ""
 "ะธะปะธ ะถะต ะธัะฟะพะปัŒะทัƒะตั‚ะต ะฝะตัั‚ะฐะฑะธะปัŒะฝัƒัŽ ะฒะตั€ัะธัŽ ะดะธัั‚ั€ะธะฑัƒั‚ะธะฒะฐ, ะณะดะต ะทะฐะฟั€ะพัˆะตะฝะฝั‹ะต ะฒะฐะผะธ\n"
 "ะฟะฐะบะตั‚ั‹ ะตั‰ั‘ ะฝะต ัะพะทะดะฐะฝั‹ ะธะปะธ ะฑั‹ะปะธ ัƒะดะฐะปะตะฝั‹ ะธะท Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ะกะปะพะผะฐะฝะฝั‹ะต ะฟะฐะบะตั‚ั‹"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ะ‘ัƒะดัƒั‚ ัƒัั‚ะฐะฝะพะฒะปะตะฝั‹ ัะปะตะดัƒัŽั‰ะธะต ะดะพะฟะพะปะฝะธั‚ะตะปัŒะฝั‹ะต ะฟะฐะบะตั‚ั‹:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ะŸั€ะตะดะปะฐะณะฐะตะผั‹ะต ะฟะฐะบะตั‚ั‹:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ะ ะตะบะพะผะตะฝะดัƒะตะผั‹ะต ะฟะฐะบะตั‚ั‹:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฝะฐะนั‚ะธ ะฟะฐะบะตั‚ %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ะฒั‹ะฑั€ะฐะฝ ะดะปั ะฐะฒั‚ะพะผะฐั‚ะธั‡ะตัะบะพะน ัƒัั‚ะฐะฝะพะฒะบะธ.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -842,47 +850,47 @@ msgstr ""
 "ะญั‚ะฐ ะบะพะผะฐะฝะดะฐ ัƒัั‚ะฐั€ะตะปะฐ. ะ˜ัะฟะพะปัŒะทัƒะนั‚ะต ะฒะผะตัั‚ะพ ะฝะตั‘ ยซapt-mark autoยป ะธ ยซapt-mark "
 "manualยป."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ะ ะฐัั‡ั‘ั‚ ะพะฑะฝะพะฒะปะตะฝะธะนโ€ฆ"
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ะะตัƒะดะฐั‡ะฝะพ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ะ“ะพั‚ะพะฒะพ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ะ’ะฝัƒั‚ั€ะตะฝะฝัั ะพัˆะธะฑะบะฐ, ั€ะตัˆะฐั‚ะตะปัŒ ะฟั€ะพะฑะปะตะผ ะฒัั‘ ะฟะพะปะพะผะฐะป"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะทะฐะฑะปะพะบะธั€ะพะฒะฐั‚ัŒ ะบะฐั‚ะฐะปะพะณ, ะบัƒะดะฐ ัะบะปะฐะดั‹ะฒะฐัŽั‚ัั ัะบะฐั‡ะธะฒะฐะตะผั‹ะต ั„ะฐะนะปั‹"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฝะฐะนั‚ะธ ะธัั‚ะพั‡ะฝะธะบ ะดะปั ะทะฐะณั€ัƒะทะบะธ ยซ%2$sยป ะฒะตั€ัะธะธ ยซ%1$sยป"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "ะ’ั‹ะฟะพะปะฝัะตั‚ัั ะทะฐะณั€ัƒะทะบะฐ %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ะฃะบะฐะถะธั‚ะต ะบะฐะบ ะผะธะฝะธะผัƒะผ ะพะดะธะฝ ะฟะฐะบะตั‚, ะธัั…ะพะดะฝั‹ะน ะบะพะด ะบะพั‚ะพั€ะพะณะพ ะฝะตะพะฑั…ะพะดะธะผะพ ะฟะพะปัƒั‡ะธั‚ัŒ"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฝะฐะนั‚ะธ ะฟะฐะบะตั‚ ั ะธัั…ะพะดะฝั‹ะผ ะบะพะดะพะผ ะดะปั %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -891,7 +899,7 @@ msgstr ""
 "ะ’ะะ˜ะœะะะ˜ะ•: ัƒะฟะฐะบะพะฒะบะฐ ยซ%sยป ะฟะพะดะดะตั€ะถะธะฒะฐะตั‚ัั ะฒ ัะธัั‚ะตะผะต ะบะพะฝั‚ั€ะพะปั ะฒะตั€ัะธะน ยซ%sยป:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -902,70 +910,70 @@ msgstr ""
 "bzr branch %s\n"
 "ะดะปั ะฟะพะปัƒั‡ะตะฝะธั ะฟะพัะปะตะดะฝะธั… (ะฒะพะทะผะพะถะฝะพ ะฝะต ะฒั‹ะฟัƒั‰ะตะฝะฝั‹ั…) ะพะฑะฝะพะฒะปะตะฝะธะน ะฟะฐะบะตั‚ะฐ.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ะŸั€ะพะฟัƒัะบะฐะตะผ ัƒะถะต ัะบะฐั‡ะฐะฝะฝั‹ะน ั„ะฐะนะป ยซ%sยป\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ะะตะดะพัั‚ะฐั‚ะพั‡ะฝะพ ะผะตัั‚ะฐ ะฒ %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ะะตะพะฑั…ะพะดะธะผะพ ะฟะพะปัƒั‡ะธั‚ัŒ %sะฑ/%sะฑ ะฐั€ั…ะธะฒะพะฒ ะธัั…ะพะดะฝะพะณะพ ะบะพะดะฐ.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ะะตะพะฑั…ะพะดะธะผะพ ะฟะพะปัƒั‡ะธั‚ัŒ %sะฑ ะฐั€ั…ะธะฒะพะฒ ะธัั…ะพะดะฝะพะณะพ ะบะพะดะฐ.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ะŸะพะปัƒั‡ะตะฝะธะต ะธัั…ะพะดะฝะพะณะพ ะบะพะดะฐ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ะะตะบะพั‚ะพั€ั‹ะต ะฐั€ั…ะธะฒั‹ ะฝะต ัƒะดะฐะปะพััŒ ะฟะพะปัƒั‡ะธั‚ัŒ."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "ะŸั€ะพะฟัƒัะบะฐะตั‚ัั ั€ะฐัะฟะฐะบะพะฒะบะฐ ัƒะถะต ั€ะฐัะฟะฐะบะพะฒะฐะฝะฝะพะณะพ ะธัั…ะพะดะฝะพะณะพ ะบะพะดะฐ ะฒ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ะšะพะผะฐะฝะดะฐ ั€ะฐัะฟะฐะบะพะฒะบะธ ยซ%sยป ะทะฐะฒะตั€ัˆะธะปะฐััŒ ะฝะตัƒะดะฐั‡ะฝะพ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ะŸั€ะพะฒะตั€ัŒั‚ะต, ัƒัั‚ะฐะฝะพะฒะปะตะฝ ะปะธ ะฟะฐะบะตั‚ ยซdpkg-devยป.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ะšะพะผะฐะฝะดะฐ ัะฑะพั€ะบะธ ยซ%sยป ะทะฐะฒะตั€ัˆะธะปะฐััŒ ะฝะตัƒะดะฐั‡ะฝะพ.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ะŸะพั€ะพะถะดั‘ะฝะฝั‹ะน ะฟั€ะพั†ะตัั ะทะฐะฒะตั€ัˆะธะปัั ะฝะตัƒะดะฐั‡ะฝะพ"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ะ”ะปั ะฟั€ะพะฒะตั€ะบะธ ะทะฐะฒะธัะธะผะพัั‚ะตะน ะดะปั ัะฑะพั€ะบะธ ะฝะตะพะฑั…ะพะดะธะผะพ ัƒะบะฐะทะฐั‚ัŒ ะบะฐะบ ะผะธะฝะธะผัƒะผ ะพะดะธะฝ "
 "ะฟะฐะบะตั‚"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -974,17 +982,17 @@ msgstr ""
 "ะฃ %s ะพั‚ััƒั‚ัั‚ะฒัƒะตั‚ ะธะฝั„ะพั€ะผะฐั†ะธั ะพะฑ ะฐั€ั…ะธั‚ะตะบั‚ัƒั€ะต. ะ”ะปั ะตั‘ ะฝะฐัั‚ั€ะพะนะบะธ ัะผะพั‚ั€ะธั‚ะต apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟะพะปัƒั‡ะธั‚ัŒ ะธะฝั„ะพั€ะผะฐั†ะธัŽ ะพ ะทะฐะฒะธัะธะผะพัั‚ัั… ะดะปั ัะฑะพั€ะบะธ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ะฝะต ะธะผะตะตั‚ ะทะฐะฒะธัะธะผะพัั‚ะตะน ะดะปั ัะฑะพั€ะบะธ.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -993,7 +1001,7 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ัŒ ั‚ะธะฟะฐ %s ะดะปั %s ะฝะต ะผะพะถะตั‚ ะฑั‹ั‚ัŒ ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ั‚ะฐะบ ะบะฐะบ %s ะฝะต "
 "ั€ะฐะทั€ะตัˆั‘ะฝ ะดะปั ะฟะฐะบะตั‚ะพะฒ ยซ%sยป"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1002,14 +1010,14 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ัŒ ั‚ะธะฟะฐ %s ะดะปั %s ะฝะต ะผะพะถะตั‚ ะฑั‹ั‚ัŒ ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ั‚ะฐะบ ะบะฐะบ ะฟะฐะบะตั‚ %s ะฝะต "
 "ะฝะฐะนะดะตะฝ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "ะะต ัƒะดะฐะปะพััŒ ัƒะดะพะฒะปะตั‚ะฒะพั€ะธั‚ัŒ ะทะฐะฒะธัะธะผะพัั‚ัŒ ั‚ะธะฟะฐ %s ะดะปั ะฟะฐะบะตั‚ะฐ %s: ะฃัั‚ะฐะฝะพะฒะปะตะฝะฝั‹ะน "
 "ะฟะฐะบะตั‚ %s ะฝะพะฒะตะต, ั‡ะตะผ ะฝะฐะดะพ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1018,7 +1026,7 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ัŒ ั‚ะธะฟะฐ %s ะดะปั %s ะฝะต ะผะพะถะตั‚ ะฑั‹ั‚ัŒ ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ั‚ะฐะบ ะบะฐะบ ะฒะตั€ัะธั-"
 "ะบะฐะฝะดะธะดะฐั‚ ะฟะฐะบะตั‚ะฐ %s ะฝะต ะผะพะถะตั‚ ัƒะดะพะฒะปะตั‚ะฒะพั€ะธั‚ัŒ ั‚ั€ะตะฑะพะฒะฐะฝะธัะผ ะฟะพ ะฒะตั€ัะธะธ"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1027,30 +1035,30 @@ msgstr ""
 "ะ—ะฐะฒะธัะธะผะพัั‚ัŒ ั‚ะธะฟะฐ %s ะดะปั %s ะฝะต ะผะพะถะตั‚ ะฑั‹ั‚ัŒ ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝะฐ, ั‚ะฐะบ ะบะฐะบ ะฟะฐะบะตั‚ %s ะฝะต "
 "ะธะผะตะตั‚ ะฒะตั€ัะธะธ-ะบะฐะฝะดะธะดะฐั‚ะฐ"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ัƒะดะพะฒะปะตั‚ะฒะพั€ะธั‚ัŒ ะทะฐะฒะธัะธะผะพัั‚ัŒ ั‚ะธะฟะฐ %s ะดะปั ะฟะฐะบะตั‚ะฐ %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ะ—ะฐะฒะธัะธะผะพัั‚ะธ ะดะปั ัะฑะพั€ะบะธ %s ะฝะต ะผะพะณัƒั‚ ะฑั‹ั‚ัŒ ัƒะดะพะฒะปะตั‚ะฒะพั€ะตะฝั‹."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "ะžะฑั€ะฐะฑะพั‚ะบะฐ ะทะฐะฒะธัะธะผะพัั‚ะตะน ะดะปั ัะฑะพั€ะบะธ ะทะฐะฒะตั€ัˆะธะปะฐััŒ ะฝะตัƒะดะฐั‡ะฝะพ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog ะดะปั %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ะŸะพะดะดะตั€ะถะธะฒะฐะตะผั‹ะต ะผะพะดัƒะปะธ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1142,7 +1150,7 @@ msgstr ""
 "ัะพะดะตั€ะถะธั‚ัั ะฟะพะดั€ะพะฑะฝะฐั ะธะฝั„ะพั€ะผะฐั†ะธั ะธ ะพะฟะธัะฐะฝะธะต ะฟะฐั€ะฐะผะตั‚ั€ะพะฒ.\n"
 "                       ะ’ APT ะตัั‚ัŒ ะบะพั€ะพะฒัŒั ะกะฃะŸะ•ะ ะกะ˜ะ›ะ.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1217,7 +1225,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ัƒะถะต ะฟะพะผะตั‡ะตะฝ ะบะฐะบ ะฝะต ะทะฐั„ะธะบัะธั€ะพะฒะฐะฝะฝั‹ะน.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ะžะถะธะดะฐะปะพััŒ ะทะฐะฒะตั€ัˆะตะฝะธะต ะฟั€ะพั†ะตััะฐ %s, ะฝะพ ะพะฝ ะฝะต ะฑั‹ะป ะทะฐะฟัƒั‰ะตะฝ"
@@ -1379,8 +1388,8 @@ msgstr "ะ”ะพะฟัƒัั‚ะธะผะพะต ะฒั€ะตะผั ะพะถะธะดะฐะฝะธั ะดะปั ัะพะตะดะธะฝะตะฝ
 msgid "Server closed the connection"
 msgstr "ะกะตั€ะฒะตั€ ะฟั€ะตั€ะฒะฐะป ัะพะตะดะธะฝะตะฝะธะต"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "ะžัˆะธะฑะบะฐ ั‡ั‚ะตะฝะธั"
 
@@ -1393,8 +1402,8 @@ msgid "Protocol corruption"
 msgstr "ะ˜ัะบะฐะถะตะฝะธะต ะฟั€ะพั‚ะพะบะพะปะฐ"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ะžัˆะธะฑะบะฐ ะทะฐะฟะธัะธ"
 
@@ -1450,7 +1459,7 @@ msgstr "ะ’ั€ะตะผั ัƒัั‚ะฐะฝะพะฒะปะตะฝะธั ัะพะตะดะธะฝะตะฝะธั ะดะปั ัะพะบะต
 msgid "Unable to accept connection"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟั€ะธะฝัั‚ัŒ ัะพะตะดะธะฝะตะฝะธะต"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะฟั€ะธ ั…ะตัˆะธั€ะพะฒะฐะฝะธะธ ั„ะฐะนะปะฐ"
 
@@ -1477,87 +1486,100 @@ msgstr "ะ—ะฐะฟั€ะพั"
 msgid "Unable to invoke "
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฒั‹ะทะฒะฐั‚ัŒ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ะกะพะตะดะธะฝะตะฝะธะต ั %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ะะต ัƒะดะฐั‘ั‚ัั ัะพะทะดะฐั‚ัŒ ัะพะบะตั‚ ะดะปั %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะธะฝะธั†ะธะฐะปะธะทะธั€ะพะฒะฐั‚ัŒ ัะพะตะดะธะฝะตะฝะธะต ั %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ะะต ัƒะดะฐั‘ั‚ัั ัะพะตะดะธะฝะธั‚ัŒัั ั %s:%s (%s), connection timed out"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ะะต ัƒะดะฐั‘ั‚ัั ัะพะตะดะธะฝะธั‚ัŒัั ั %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ะกะพะตะดะธะฝะตะฝะธะต ั %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฝะฐะนั‚ะธ IP-ะฐะดั€ะตั ะดะปั ยซ%sยป"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ะ’ั€ะตะผะตะฝะฝะฐั ะพัˆะธะฑะบะฐ ะฟั€ะธ ะฟะพะฟั‹ั‚ะบะต ะฟะพะปัƒั‡ะธั‚ัŒ IP-ะฐะดั€ะตั ยซ%sยป"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "ะงั‚ะพ-ั‚ะพ ัั‚ั€ะฐะฝะฝะพะต ะฟั€ะพะธะทะพัˆะปะพ ะฟั€ะธ ะพะฟั€ะตะดะตะปะตะฝะธะธ ยซ%s:%sยป (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ะงั‚ะพ-ั‚ะพ ัั‚ั€ะฐะฝะฝะพะต ะฟั€ะพะธะทะพัˆะปะพ ะฟั€ะธ ะพะฟั€ะตะดะตะปะตะฝะธะธ ยซ%s:%sยป (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ัะพะตะดะธะฝะธั‚ัŒัั ั %s: %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ะ’ะฝัƒั‚ั€ะตะฝะฝัั ะพัˆะธะฑะบะฐ: ะŸั€ะฐะฒะธะปัŒะฝะฐั ะฟะพะดะฟะธััŒ, ะฝะพ ะฝะต ัƒะดะฐะปะพััŒ ะพะฟั€ะตะดะตะปะธั‚ัŒ ะพั‚ะฟะตั‡ะฐั‚ะพะบ "
 "ะบะปัŽั‡ะฐ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "ะะฐะนะดะตะฝะฐ ะบะฐะบ ะผะธะฝะธะผัƒะผ ะพะดะฝะฐ ะฝะตะฟั€ะฐะฒะธะปัŒะฝะฐั ะฟะพะดะฟะธััŒ."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฒั‹ะฟะพะปะฝะธั‚ัŒ ยซgpgvยป ะดะปั ะฟั€ะพะฒะตั€ะบะธ ะฟะพะดะฟะธัะธ (gpgv ัƒัั‚ะฐะฝะพะฒะปะตะฝะฐ?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "ะะตะธะทะฒะตัั‚ะฝะฐั ะพัˆะธะฑะบะฐ ะฟั€ะธ ะฒั‹ะฟะพะปะฝะตะฝะธะธ gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ะกะปะตะดัƒัŽั‰ะธะต ะฟะพะดะฟะธัะธ ะฝะตะฒะตั€ะฝั‹ะต:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1597,53 +1619,53 @@ msgstr "ะญั‚ะพั‚ HTTP-ัะตั€ะฒะตั€ ะฝะต ะฟะพะดะดะตั€ะถะธะฒะฐะตั‚ ัะบะฐั‡ะธะฒะฐะ
 msgid "Unknown date format"
 msgstr "ะะตะธะทะฒะตัั‚ะฝั‹ะน ั„ะพั€ะผะฐั‚ ะดะฐะฝะฝั‹ั…"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "ะžัˆะธะฑะบะฐ ะฒ select"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ะ’ั€ะตะผั ะพะถะธะดะฐะฝะธั ะดะปั ัะพะตะดะธะฝะตะฝะธั ะธัั‚ะตะบะปะพ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ะžัˆะธะฑะบะฐ ะทะฐะฟะธัะธ ะฒ ะฒั‹ั…ะพะดะฝะพะน ั„ะฐะนะป"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ะžัˆะธะฑะบะฐ ะทะฐะฟะธัะธ ะฒ ั„ะฐะนะป"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ะžัˆะธะฑะบะฐ ะทะฐะฟะธัะธ ะฒ ั„ะฐะนะป"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ะžัˆะธะฑะบะฐ ั‡ั‚ะตะฝะธั, ัƒะดะฐะปั‘ะฝะฝั‹ะน ัะตั€ะฒะตั€ ะฟั€ะตั€ะฒะฐะป ัะพะตะดะธะฝะตะฝะธะต"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ะžัˆะธะฑะบะฐ ั‡ั‚ะตะฝะธั ั ัะตั€ะฒะตั€ะฐ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ะะตะฒะตั€ะฝั‹ะน ะทะฐะณะพะปะพะฒะพะบ ะดะฐะฝะฝั‹ั…"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ะกะพะตะดะธะฝะตะฝะธะต ั€ะฐะทะพั€ะฒะฐะฝะพ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ะ’ะฝัƒั‚ั€ะตะฝะฝัั ะพัˆะธะฑะบะฐ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟั€ะพั‡ะธั‚ะฐั‚ัŒ %s"
@@ -1670,7 +1692,12 @@ msgstr "ะคะฐะนะป ยซ%sยป ะฝะต ะฝะฐะนะดะตะฝ ะฝะฐ ะทะตั€ะบะฐะปะต"
 msgid "Can not read mirror file '%s'"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟั€ะพั‡ะธั‚ะฐั‚ัŒ ั„ะฐะนะป ะฝะฐ ะทะตั€ะบะฐะปะต ยซ%sยป"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟั€ะพั‡ะธั‚ะฐั‚ัŒ ั„ะฐะนะป ะฝะฐ ะทะตั€ะบะฐะปะต ยซ%sยป"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[ะ—ะตั€ะบะฐะปะพ: %s]"
@@ -1767,7 +1794,7 @@ msgstr ""
 "  -c=? ะงะธั‚ะฐั‚ัŒ ัƒะบะฐะทะฐะฝะฝั‹ะน ั„ะฐะนะป ะฝะฐัั‚ั€ะพะนะบะธ\n"
 "  -o=? ะ—ะฐะดะฐั‚ัŒ ะทะฝะฐั‡ะตะฝะธะต ะฟั€ะพะธะทะฒะพะปัŒะฝะพะน ะฝะฐัั‚ั€ะพะนะบะต, ะฝะฐะฟั€ะธะผะตั€, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะทะฐะฟะธัะฐั‚ัŒ ะฒ %s"
@@ -1919,8 +1946,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพั‚ะบั€ั‹ั‚ัŒ DB ั„ะฐะนะป %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟะพะปัƒั‡ะธั‚ัŒ ะฐั‚ั€ะธะฑัƒั‚ั‹ %s"
@@ -1933,87 +1960,87 @@ msgstr "ะ’ ะฐั€ั…ะธะฒะต ะฝะตั‚ ะฟะพะปั control"
 msgid "Unable to get a cursor"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟะพะปัƒั‡ะธั‚ัŒ ะบัƒั€ัะพั€"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: ะะต ัƒะดะฐะปะพััŒ ะฟั€ะพั‡ะธั‚ะฐั‚ัŒ ะบะฐั‚ะฐะปะพะณ %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: ะะต ัƒะดะฐะปะพััŒ ะฟั€ะพั‡ะธั‚ะฐั‚ัŒ ะฐั‚ั€ะธะฑัƒั‚ั‹ %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: ะžัˆะธะฑะบะธ ะพั‚ะฝะพััั‚ัั ะบ ั„ะฐะนะปัƒ "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟั€ะพัะปะตะดะพะฒะฐั‚ัŒ ะฟะพ ััั‹ะปะบะต %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ัะพะฒะตั€ัˆะธั‚ัŒ ะพะฑั…ะพะด ะดะตั€ะตะฒะฐ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพั‚ะบั€ั‹ั‚ัŒ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟั€ะพั‡ะตัั‚ัŒ ััั‹ะปะบัƒ %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ัƒะดะฐะปะธั‚ัŒ %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ะะต ัƒะดะฐะปะพััŒ ัะพะทะดะฐั‚ัŒ ััั‹ะปะบัƒ %s ะฝะฐ %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ะŸั€ะตะฒั‹ัˆะตะฝ ะปะธะผะธั‚ ะฒ %sB ะฒ DeLink.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ะ’ ะฐั€ั…ะธะฒะต ะฝะตั‚ ะฟะพะปั package"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  ะะตั‚ ะทะฐะฟะธัะธ ะพ ะฟะตั€ะตะฝะฐะทะฝะฐั‡ะตะฝะธะธ (override) ะดะปั %s\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ะฟะฐะบะตั‚ %s ัะพะฟั€ะพะฒะพะถะดะฐะตั‚ %s, ะฐ ะฝะต %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  ะะตั‚ ะทะฐะฟะธัะธ source override ะดะปั %s\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  ะะตั‚ ะทะฐะฟะธัะธ binary override ะดะปั %s\n"
@@ -2088,7 +2115,7 @@ msgstr "ะžัˆะธะฑะบะฐ ั‡ั‚ะตะฝะธั ะฒะพ ะฒั€ะตะผั ะฒั‹ั‡ะธัะปะตะฝะธั MD5"
 msgid "Problem unlinking %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ัƒะดะฐะปะธั‚ัŒ %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟะตั€ะตะธะผะตะฝะพะฒะฐั‚ัŒ %s ะฒ %s"
@@ -2146,23 +2173,23 @@ msgstr ""
 "  -c=? ั‡ะธั‚ะฐั‚ัŒ ัƒะบะฐะทะฐะฝะฝั‹ะน ั„ะฐะนะป ะฝะฐัั‚ั€ะพะนะบะธ\n"
 "  -o=? ะ—ะฐะดะฐั‚ัŒ ะทะฝะฐั‡ะตะฝะธะต ะฟั€ะพะธะทะฒะพะปัŒะฝะพะน ะฝะฐัั‚ั€ะพะนะบะต, ะฝะฐะฟั€ะธะผะตั€, -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ัะพะทะดะฐั‚ัŒ ะบะฐะฝะฐะปั‹"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฒั‹ะฟะพะปะฝะธั‚ัŒ gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ะŸะพะฒั€ะตะถะดั‘ะฝะฝั‹ะน ะฐั€ั…ะธะฒ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ะะตะฟั€ะฐะฒะธะปัŒะฝะฐั ะบะพะฝั‚ั€ะพะปัŒะฝะฐั ััƒะผะผะฐ Tar, ะฐั€ั…ะธะฒ ะฟะพะฒั€ะตะถะดั‘ะฝ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ะะตะธะทะฒะตัั‚ะฝั‹ะน ะทะฐะณะพะปะพะฒะพะบ ะฒ ะฐั€ั…ะธะฒะต TAR. ะขะธะฟ %u, ัะปะตะผะตะฝั‚ %s"
@@ -2233,54 +2260,54 @@ msgstr "ะะต ัƒะดะฐะปะพััŒ ะทะฐะฟะธัะฐั‚ัŒ ะฒ ั„ะฐะนะป %s"
 msgid "Failed to close file %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะทะฐะบั€ั‹ั‚ัŒ ั„ะฐะนะป %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ะกะปะธัˆะบะพะผ ะดะปะธะฝะฝั‹ะน ะฟัƒั‚ัŒ %s"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "ะŸะพะฒั‚ะพั€ะฝะฐั ั€ะฐัะฟะฐะบะพะฒะบะฐ %s"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ะšะฐั‚ะฐะปะพะณ %s ะฒั…ะพะดะธั‚ ะฒ ัะฟะธัะพะบ diverted"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ะŸะฐะบะตั‚ ะฟั‹ั‚ะฐะตั‚ัั ะฟะธัะฐั‚ัŒ ะฒ diversion %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "ะŸัƒั‚ัŒ diversion ัะปะธัˆะบะพะผ ะดะปะธะฝะตะฝ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ะšะฐั‚ะฐะปะพะณ %s ะฑั‹ะป ะทะฐะผะตะฝั‘ะฝ ะฝะต-ะบะฐั‚ะฐะปะพะณะพะผ"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ั€ะฐะทะผะตัั‚ะธั‚ัŒ ัƒะทะตะป ะฒ ั…ะตัˆะต"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ะŸัƒั‚ัŒ ัะปะธัˆะบะพะผ ะดะปะธะฝะตะฝ"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "ะคะฐะนะปั‹ ะทะฐะผะตะฝััŽั‚ัั ัะพะดะตั€ะถะธะผั‹ะผ ะฟะฐะบะตั‚ะฐ %s ะฑะตะท ะฒะตั€ัะธะธ"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ะคะฐะนะป %s/%s ะฟะตั€ะตะฟะธัั‹ะฒะฐะตั‚ ั„ะฐะนะป ะฒ ะฟะฐะบะตั‚ะต %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟะพะปัƒั‡ะธั‚ัŒ ะฐั‚ั€ะธะฑัƒั‚ั‹ %s"
@@ -2362,30 +2389,30 @@ msgstr ""
 "ะพั‚ะบะปัŽั‡ะตะฝะพ ะฟะพะปัŒะทะพะฒะฐั‚ะตะปะตะผ."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liะด %liั‡ %liะผะธะฝ %liั"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liั‡ %liะผะธะฝ %liั"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liะผะธะฝ %liั"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%liั"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "ะะต ะฝะฐะนะดะตะฝะพ: %s"
@@ -2459,6 +2486,16 @@ msgstr "%c%sโ€ฆ ะžัˆะธะฑะบะฐ!"
 msgid "%c%s... Done"
 msgstr "%c%sโ€ฆ ะ“ะพั‚ะพะฒะพ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "โ€ฆ"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%sโ€ฆ %u%%"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2519,46 +2556,46 @@ msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฟะพะปัƒั‡ะธั‚ัŒ ะฐั‚ั€ะธะฑัƒั‚ั‹ cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะทะฐะบั€ั‹ั‚ะธั gzip-ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "ะ‘ะปะพะบะธั€ะพะฒะบะฐ ะฝะต ะธัะฟะพะปัŒะทัƒะตั‚ัั, ั‚ะฐะบ ะบะฐะบ ั„ะฐะนะป ะฑะปะพะบะธั€ะพะฒะบะธ %s ะดะพัั‚ัƒะฟะตะฝ ั‚ะพะปัŒะบะพ ะดะปั "
 "ั‡ั‚ะตะฝะธั"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพั‚ะบั€ั‹ั‚ัŒ ั„ะฐะนะป ะฑะปะพะบะธั€ะพะฒะบะธ %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ะ‘ะปะพะบะธั€ะพะฒะบะฐ ะฝะต ะธัะฟะพะปัŒะทัƒะตั‚ัั, ั‚ะฐะบ ะบะฐะบ ั„ะฐะนะป ะฑะปะพะบะธั€ะพะฒะบะธ %s ะฝะฐั…ะพะดะธั‚ัั ะฝะฐ ั„ะฐะนะปะพะฒะพะน "
 "ัะธัั‚ะตะผะต nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟะพะปัƒั‡ะธั‚ัŒ ะดะพัั‚ัƒะฟ ะบ ั„ะฐะนะปัƒ ะฑะปะพะบะธั€ะพะฒะบะธ %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "ะกะฟะธัะพะบ ั„ะฐะนะปะพะฒ ะฝะต ะผะพะถะตั‚ ะฑั‹ั‚ัŒ ัะพะทะดะฐะฝ, ั‚ะฐะบ ะบะฐะบ ยซ%sยป ะฝะต ัะฒะปัะตั‚ัั ะบะฐั‚ะฐะปะพะณะพะผ"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "ะคะฐะนะป ยซ%sยป ะฒ ะบะฐั‚ะฐะปะพะณะต ยซ%sยป ะธะณะฝะพั€ะธั€ัƒะตั‚ัั, ั‚ะฐะบ ะบะฐะบ ัั‚ะพ ะฝะตะพะฑั‹ั‡ะฝั‹ะน ั„ะฐะนะป"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "ะคะฐะนะป ยซ%sยป ะฒ ะบะฐั‚ะฐะปะพะณะต ยซ%sยป ะธะณะฝะพั€ะธั€ัƒะตั‚ัั, ั‚ะฐะบ ะบะฐะบ ะพะฝ ะฝะต ะธะผะตะตั‚ ั€ะฐััˆะธั€ะตะฝะธั"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2566,75 +2603,81 @@ msgstr ""
 "ะคะฐะนะป ยซ%sยป ะฒ ะบะฐั‚ะฐะปะพะณะต ยซ%sยป ะธะณะฝะพั€ะธั€ัƒะตั‚ัั, ั‚ะฐะบ ะบะฐะบ ะพะฝ ะฝะต ะธะผะตะตั‚ ะฝะตะฟั€ะฐะฒะธะปัŒะฝะพะต "
 "ั€ะฐััˆะธั€ะตะฝะธะต"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 "ะะฐั€ัƒัˆะตะฝะธะต ะทะฐั‰ะธั‚ั‹ ะฟะฐะผัั‚ะธ (segmentation fault) ะฒ ะฟะพั€ะพะถะดั‘ะฝะฝะพะผ ะฟั€ะพั†ะตััะต %s."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ะŸะพั€ะพะถะดั‘ะฝะฝั‹ะน ะฟั€ะพั†ะตัั %s ะฟะพะปัƒั‡ะธะป ัะธะณะฝะฐะป %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ะŸะพั€ะพะถะดั‘ะฝะฝั‹ะน ะฟั€ะพั†ะตัั %s ะฒะตั€ะฝัƒะป ะบะพะด ะพัˆะธะฑะบะธ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ะŸะพั€ะพะถะดั‘ะฝะฝั‹ะน ะฟั€ะพั†ะตัั %s ะฝะตะพะถะธะดะฐะฝะฝะพ ะทะฐะฒะตั€ัˆะธะปัั"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพั‚ะบั€ั‹ั‚ัŒ ั„ะฐะนะป %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพั‚ะบั€ั‹ั‚ัŒ ั„ะฐะนะปะพะฒั‹ะน ะดะตัะบั€ะธะฟั‚ะพั€ %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ัะพะทะดะฐั‚ัŒ IPC ั ะฟะพั€ะพะถะดั‘ะฝะฝั‹ะผ ะฟั€ะพั†ะตััะพะผ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฒั‹ะฟะพะปะฝะธั‚ัŒ ะบะพะผะฟั€ะตััะพั€ "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 "ะพัˆะธะฑะบะฐ ะฟั€ะธ ั‡ั‚ะตะฝะธะธ; ัะพะฑะธั€ะฐะปะธััŒ ะฟั€ะพั‡ะตัั‚ัŒ ะตั‰ั‘ %llu ะฑะฐะนั‚, ะฝะพ ะฝะธั‡ะตะณะพ ะฑะพะปัŒัˆะต ะฝะตั‚"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ะพัˆะธะฑะบะฐ ะฟั€ะธ ะทะฐะฟะธัะธ; ัะพะฑะธั€ะฐะปะธััŒ ะทะฐะฟะธัะฐั‚ัŒ ะตั‰ั‘ %llu ะฑะฐะนั‚, ะฝะพ ะฝะต ัะผะพะณะปะธ"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะทะฐะบั€ั‹ั‚ะธั ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะฟั€ะธ ะฟะตั€ะตะธะผะตะฝะพะฒะฐะฝะธะธ ั„ะฐะนะปะฐ %s ะฒ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะฟั€ะธ ัƒะดะฐะปะตะฝะธะธ ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะฟั€ะธ ัะธะฝั…ั€ะพะฝะธะทะฐั†ะธะธ ั„ะฐะนะปะฐ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ะกะฒัะทะบะฐ ะบะปัŽั‡ะตะน ะฒ %s ะฝะต ัƒัั‚ะฐะฝะพะฒะปะตะฝะฐ."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ะšััˆ ะฟะฐะบะตั‚ะพะฒ ะฟัƒัั‚"
@@ -2660,59 +2703,59 @@ msgstr "ะญั‚ะฐ ะฒะตั€ัะธั APT ะฝะต ะฟะพะดะดะตั€ะถะธะฒะฐะตั‚ ัะธัั‚ะตะผัƒ ะฒะ
 msgid "The package cache was built for a different architecture"
 msgstr "ะšััˆ ะฟะฐะบะตั‚ะพะฒ ะฑั‹ะป ัะพะฑั€ะฐะฝ ะดะปั ะดั€ัƒะณะพะน ะฐั€ั…ะธั‚ะตะบั‚ัƒั€ั‹"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ะ—ะฐะฒะธัะธั‚"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "ะŸั€ะตะดะ—ะฐะฒะธัะธั‚"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ะŸั€ะตะดะปะฐะณะฐะตั‚"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ะ ะตะบะพะผะตะฝะดัƒะตั‚"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "ะšะพะฝั„ะปะธะบั‚ัƒะตั‚"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ะ—ะฐะผะตะฝัะตั‚"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ะ—ะฐะผะตั‰ะฐะตั‚"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ะ›ะพะผะฐะตั‚"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "ะฃะปัƒั‡ัˆะฐะตั‚"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "ะฒะฐะถะฝั‹ะน"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ะฝะตะพะฑั…ะพะดะธะผั‹ะน"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ัั‚ะฐะฝะดะฐั€ั‚ะฝั‹ะน"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ะฝะตะพะฑัะทะฐั‚ะตะปัŒะฝั‹ะน"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ะดะพะฟะพะปะฝะธั‚ะตะปัŒะฝั‹ะน"
 
@@ -2816,17 +2859,17 @@ msgstr "ะžั‚ะบั€ั‹ั‚ะธะต %s"
 msgid "Line %u too long in source list %s."
 msgstr "ะกั‚ั€ะพะบะฐ %u ะฒ ัะฟะธัะบะต ะธัั‚ะพั‡ะฝะธะบะพะฒ %s ัะปะธัˆะบะพะผ ะดะปะธะฝะฝะฐ."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ะ˜ัะบะฐะถั‘ะฝะฝะฐั ัั‚ั€ะพะบะฐ %u ะฒ ัะฟะธัะบะต ะธัั‚ะพั‡ะฝะธะบะพะฒ %s (ั‚ะธะฟ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ะะตะธะทะฒะตัั‚ะฝั‹ะน ั‚ะธะฟ ยซ%sยป ะฒ ัั‚ั€ะพะบะต %u ะฒ ัะฟะธัะบะต ะธัั‚ะพั‡ะฝะธะบะพะฒ %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2835,12 +2878,12 @@ msgstr ""
 "ะะต ัƒะดะฐะปะพััŒ ะฒั‹ะฟะพะปะฝะธั‚ัŒ ะพะฟะตั€ะฐั‚ะธะฒะฝัƒัŽ ะฝะฐัั‚ั€ะพะนะบัƒ ยซ%sยป. ะŸะพะดั€ะพะฑะฝะตะน, ัะผะพั‚ั€ะธั‚ะต ะฒ man 5 "
 "apt.conf ะพ APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฝะฐัั‚ั€ะพะธั‚ัŒ ยซ%sยป."
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2865,7 +2908,7 @@ msgid ""
 msgstr ""
 "ะŸะฐะบะตั‚ %s ะฝัƒะถะดะฐะตั‚ัั ะฒ ะฟะตั€ะตัƒัั‚ะฐะฝะพะฒะบะต, ะฝะพ ะฝะฐะนั‚ะธ ะฐั€ั…ะธะฒ ะดะปั ะฝะตะณะพ ะฝะต ัƒะดะฐะปะพััŒ."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2873,11 +2916,11 @@ msgstr ""
 "ะžัˆะธะฑะบะฐ, pkgProblemResolver::Resolve ัะณะตะฝะตั€ะธั€ะพะฒะฐะป ะฟะพะฒั€ะตะถะดั‘ะฝะฝั‹ะต ะฟะฐะบะตั‚ั‹. ะญั‚ะพ "
 "ะผะพะถะตั‚ ะฑั‹ั‚ัŒ ะฒั‹ะทะฒะฐะฝะพ ะพั‚ะปะพะถะตะฝะฝั‹ะผะธ (held) ะฟะฐะบะตั‚ะฐะผะธ."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะธัะฟั€ะฐะฒะธั‚ัŒ ะพัˆะธะฑะบะธ, ัƒ ะฒะฐั ะพั‚ะปะพะถะตะฝั‹ (held) ะฑะธั‚ั‹ะต ะฟะฐะบะตั‚ั‹."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2885,7 +2928,7 @@ msgstr ""
 "ะะตะบะพั‚ะพั€ั‹ะต ะธะฝะดะตะบัะฝั‹ะต ั„ะฐะนะปั‹ ะฝะต ัะบะฐั‡ะฐะปะธััŒ. ะžะฝะธ ะฑั‹ะปะธ ะฟั€ะพะธะณะฝะพั€ะธั€ะพะฒะฐะฝั‹ ะธะปะธ ะฒะผะตัั‚ะพ "
 "ะฝะธั… ะฑั‹ะปะธ ะธัะฟะพะปัŒะทะพะฒะฐะฝั‹ ัั‚ะฐั€ั‹ะต ะฒะตั€ัะธะธ."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "ะšะฐั‚ะฐะปะพะณ ัะฟะธัะบะฐ %spartial ะพั‚ััƒั‚ัั‚ะฒัƒะตั‚."
@@ -2922,17 +2965,17 @@ msgstr "ะ”ั€ะฐะนะฒะตั€ ะดะปั ะผะตั‚ะพะดะฐ %s ะฝะต ะฝะฐะนะดะตะฝ."
 msgid "Method %s did not start correctly"
 msgstr "ะœะตั‚ะพะด %s ะทะฐะฟัƒัั‚ะธะปัั ะฝะต ะบะพั€ั€ะตะบั‚ะฝะพ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ะ’ัั‚ะฐะฒัŒั‚ะต ะดะธัะบ ั ะผะตั‚ะบะพะน ยซ%sยป ะฒ ัƒัั‚ั€ะพะนัั‚ะฒะพ ยซ%sยป ะธ ะฝะฐะถะผะธั‚ะต ะฒะฒะพะด."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ะกะธัั‚ะตะผะฐ ะฟะฐะบะตั‚ะธั€ะพะฒะฐะฝะธั ยซ%sยป ะฝะต ะฟะพะดะดะตั€ะถะธะฒะฐะตั‚ัั"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะพะฟั€ะตะดะตะปะธั‚ัŒ ะฟะพะดั…ะพะดัั‰ะธะน ั‚ะธะฟ ัะธัั‚ะตะผั‹ ะฟะฐะบะตั‚ะธั€ะพะฒะฐะฝะธั"
 
@@ -2987,14 +3030,14 @@ msgstr "ะšััˆ ะธะผะตะตั‚ ะฝะตัะพะฒะผะตัั‚ะธะผัƒัŽ ัะธัั‚ะตะผัƒ ะฒะตั€ัะธะน
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ะŸั€ะพะธะทะพัˆะปะฐ ะพัˆะธะฑะบะฐ ะฒะพ ะฒั€ะตะผั ะพะฑั€ะฐะฑะพั‚ะบะธ %s (%s%d)"
@@ -3021,26 +3064,26 @@ msgstr ""
 "ะŸั€ะตะฒั‹ัˆะตะฝะพ ะดะพะฟัƒัั‚ะธะผะพะต ะบะพะปะธั‡ะตัั‚ะฒะพ ะทะฐะฒะธัะธะผะพัั‚ะตะน, ะบะพั‚ะพั€ะพะต ัะฟะพัะพะฑะตะฝ ะพะฑั€ะฐะฑะพั‚ะฐั‚ัŒ "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ะ’ะพ ะฒั€ะตะผั ะพะฑั€ะฐะฑะพั‚ะบะธ ั„ะฐะนะปะฐ ะทะฐะฒะธัะธะผะพัั‚ะตะน ะฝะต ะฝะฐะนะดะตะฝ ะฟะฐะบะตั‚ %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะฟะพะปัƒั‡ะธั‚ัŒ ะฐั‚ั€ะธะฑัƒั‚ั‹ ัะฟะธัะบะฐ ะฟะฐะบะตั‚ะพะฒ ะธัั…ะพะดะฝะพะณะพ ะบะพะดะฐ %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ะงั‚ะตะฝะธะต ัะฟะธัะบะพะฒ ะฟะฐะบะตั‚ะพะฒ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ะกะฑะพั€ ะธะฝั„ะพั€ะผะฐั†ะธะธ ะพ Provides"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ะžัˆะธะฑะบะฐ ะฒะฒะพะดะฐ/ะฒั‹ะฒะพะดะฐ ะฟั€ะธ ะฟะพะฟั‹ั‚ะบะต ัะพั…ั€ะฐะฝะธั‚ัŒ ะบััˆ ะธัั‚ะพั‡ะฝะธะบะพะฒ"
 
@@ -3053,12 +3096,12 @@ msgstr "ะฟะตั€ะตะธะผะตะฝะพะฒะฐั‚ัŒ ะฝะต ัƒะดะฐะปะพััŒ, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ะฝะต ัะพะฒะฟะฐะดะฐะตั‚"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "ะฅะตัˆ ััƒะผะผะฐ ะฝะต ัะพะฒะฟะฐะดะฐะตั‚"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3067,16 +3110,16 @@ msgstr ""
 "ะะตะฒะพะทะผะพะถะฝะพ ะฝะฐะนั‚ะธ ะพะถะธะดะฐะตะผั‹ะน ัะปะตะผะตะฝั‚ ยซ%sยป ะฒ ั„ะฐะนะปะต Release (ะฝะตะบะพั€ั€ะตะบั‚ะฝะฐั ะทะฐะฟะธััŒ "
 "ะฒ sources.list ะธะปะธ ั„ะฐะนะป)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ะฝะฐะนั‚ะธ ั…ะตัˆ-ััƒะผะผัƒ ยซ%sยป ะฒ ั„ะฐะนะปะต Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ะะตะดะพัั‚ัƒะฟะตะฝ ะพั‚ะบั€ั‹ั‚ั‹ะน ะบะปัŽั‡ ะดะปั ัะปะตะดัƒัŽั‰ะธั… ID ะบะปัŽั‡ะตะน:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3085,27 +3128,27 @@ msgstr ""
 "ะคะฐะนะป Release ะดะปั %s ะฟั€ะพัั€ะพั‡ะตะฝ (ะฝะตะดะพัั‚ะพะฒะตั€ะฝั‹ะน ะฝะฐั‡ะธะฝะฐั ั %s). ะžะฑะฝะพะฒะปะตะฝะธะต ัั‚ะพะณะพ "
 "ั€ะตะฟะพะทะธั‚ะพั€ะธั ะฟั€ะพะธะทะฒะพะดะธั‚ัŒัั ะฝะต ะฑัƒะดะตั‚."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ะšะพะฝั„ะปะธะบั‚ ั€ะฐัะฟั€ะพัั‚ั€ะฐะฝะตะฝะธั: %s (ะพะถะธะดะฐะปัั %s, ะฝะพ ะฟะพะปัƒั‡ะตะฝ %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "ะŸั€ะพะธะทะพัˆะปะฐ ะพัˆะธะฑะบะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะต ะฟะพะดะฟะธัะธ. ะ ะตะฟะพะทะธั‚ะพั€ะธะน ะฝะต ะพะฑะฝะพะฒะปั‘ะฝ ะธ ะฑัƒะดัƒั‚ "
 "ะธัะฟะพะปัŒะทะพะฒะฐะฝั‹ ะฟั€ะตะดั‹ะดัƒั‰ะธะต ะธะฝะดะตะบัะฝั‹ะต ั„ะฐะนะปั‹. ะžัˆะธะฑะบะฐ GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ะžัˆะธะฑะบะฐ GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3114,7 +3157,7 @@ msgstr ""
 "ะะต ัƒะดะฐะปะพััŒ ะพะฑะฝะฐั€ัƒะถะธั‚ัŒ ั„ะฐะนะป ะฟะฐะบะตั‚ะฐ %s. ะญั‚ะพ ะผะพะถะตั‚ ะพะทะฝะฐั‡ะฐั‚ัŒ, ั‡ั‚ะพ ะฒะฐะผ ะฟั€ะธะดั‘ั‚ัั "
 "ะฒั€ัƒั‡ะฝัƒัŽ ะธัะฟั€ะฐะฒะธั‚ัŒ ัั‚ะพั‚ ะฟะฐะบะตั‚ (ะฒะพะทะผะพะถะฝะพ, ะฟั€ะพะฟัƒั‰ะตะฝ arch)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3123,37 +3166,37 @@ msgstr ""
 "ะะต ัƒะดะฐะปะพััŒ ะพะฑะฝะฐั€ัƒะถะธั‚ัŒ ั„ะฐะนะป ะฟะฐะบะตั‚ะฐ %s. ะญั‚ะพ ะผะพะถะตั‚ ะพะทะฝะฐั‡ะฐั‚ัŒ, ั‡ั‚ะพ ะฒะฐะผ ะฟั€ะธะดั‘ั‚ัั "
 "ะฒั€ัƒั‡ะฝัƒัŽ ะธัะฟั€ะฐะฒะธั‚ัŒ ัั‚ะพั‚ ะฟะฐะบะตั‚."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "ะะตะบะพั€ั€ะตะบั‚ะฝั‹ะน ะฟะตั€ะตั‡ะตะฝัŒ ะฟะฐะบะตั‚ะพะฒ. ะะตั‚ ะฟะพะปั Filename: ะดะปั ะฟะฐะบะตั‚ะฐ %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ะะต ัะพะฒะฟะฐะดะฐะตั‚ ั€ะฐะทะผะตั€"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ะะตะฒะพะทะผะพะถะฝะพ ั€ะฐะทะพะฑั€ะฐั‚ัŒ ัะพะดะตั€ะถะธะผะพะต ั„ะฐะนะปะฐ Release (%s)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "ะžั‚ััƒั‚ัั‚ะฒัƒัŽั‚ ั€ะฐะทะดะตะปั‹ ะฒ ั„ะฐะนะปะต Release (%s)"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "ะžั‚ััƒั‚ัั‚ะฒัƒัŽั‚ ัะปะตะผะตะฝั‚ั‹ Hash ะฒ ั„ะฐะนะปะต Release (%s)"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปัŒะฝั‹ะน ัะปะตะผะตะฝั‚ ยซValid-Untilยป ะฒ ั„ะฐะนะปะต Release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ะะตะฟั€ะฐะฒะธะปัŒะฝั‹ะน ัะปะตะผะตะฝั‚ ยซDateยป ะฒ ั„ะฐะนะปะต Release %s"
@@ -3181,7 +3224,7 @@ msgstr "ะ˜ะดะตะฝั‚ะธั„ะธะบะฐั†ะธั.. "
 msgid "Stored label: %s\n"
 msgstr "ะะฐะนะดะตะฝะฐ ะผะตั‚ะบะฐ: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ะ ะฐะทะผะพะฝั‚ะธั€ะพะฒะฐะฝะธะต CD-ROMโ€ฆ\n"
 
@@ -3245,30 +3288,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ะšะพะฟะธั€ะพะฒะฐะฝะธะต ัะฟะธัะบะพะฒ ะฟะฐะบะตั‚ะพะฒโ€ฆ"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ะ—ะฐะฟะธััŒ ะฝะพะฒะพะณะพ ัะฟะธัะบะฐ ะธัั‚ะพั‡ะฝะธะบะพะฒ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ะ—ะฐะฟะธัะธ ะฒ ัะฟะธัะบะต ะธัั‚ะพั‡ะฝะธะบะพะฒ ะดะปั ัั‚ะพะณะพ ะดะธัะบะฐ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "ะกะพั…ั€ะฐะฝะตะฝะพ %i ะทะฐะฟะธัะตะน.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "ะกะพั…ั€ะฐะฝะตะฝะพ %i ะทะฐะฟะธัะตะน ั %i ะพั‚ััƒั‚ัั‚ะฒัƒัŽั‰ะธะผะธ ั„ะฐะนะปะฐะผะธ.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "ะกะพั…ั€ะฐะฝะตะฝะพ %i ะทะฐะฟะธัะตะน ั %i ะฝะตัะพะฒะฟะฐะดะฐัŽั‰ะธะผะธ ั„ะฐะนะปะฐะผะธ\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3285,17 +3328,6 @@ msgstr "ะะต ัƒะดะฐะปะพััŒ ะฝะฐะนั‚ะธ ะฐัƒั‚ะตะฝั‚ะธั„ะธะบะฐั†ะธะพะฝะฝัƒัŽ ะทะฐ
 msgid "Hash mismatch for: %s"
 msgstr "ะะต ัะพะฒะฟะฐะดะฐะตั‚ ั…ะตัˆ ััƒะผะผะฐ ะดะปั: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "ะคะฐะนะป %s ะฝะต ะฝะฐั‡ะธะฝะฐะตั‚ัั ั ะฟั€ะพะทั€ะฐั‡ะฝะพ ะฟะพะดะฟะธัะฐะฝะฝะพะณะพ ัะพะพะฑั‰ะตะฝะธั"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ะกะฒัะทะบะฐ ะบะปัŽั‡ะตะน ะฒ %s ะฝะต ัƒัั‚ะฐะฝะพะฒะปะตะฝะฐ."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3368,115 +3400,115 @@ msgstr "ะŸะพะดะณะพั‚ะพะฒะบะฐ ะบ ะฟั€ะธั‘ะผัƒ ั€ะตัˆะตะฝะธั"
 msgid "External solver failed without a proper error message"
 msgstr "ะ’ะฝะตัˆะฝะธะน ั€ะตัˆะฐั‚ะตะปัŒ ะทะฐะฒะตั€ัˆะธะปัั ั ะพัˆะธะฑะบะพะน ะฝะต ะฟะตั€ะตะดะฐะฒ ัะพะพะฑั‰ะตะฝะธั ะพะฑ ะพัˆะธะฑะบะต"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "ะ—ะฐะฟัƒัั‚ะธั‚ัŒ ะฒะฝะตัˆะฝะธะน ั€ะตัˆะฐั‚ะตะปัŒ"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ะฃัั‚ะฐะฝะฐะฒะปะธะฒะฐะตั‚ัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ะะฐัั‚ั€ะฐะธะฒะฐะตั‚ัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ะฃะดะฐะปัะตั‚ัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "ะ’ั‹ะฟะพะปะฝัะตั‚ัั ะฟะพะปะฝะพะต ัƒะดะฐะปะตะฝะธะต %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "ะฃะฒะตะดะพะผะปะตะฝะธะต ะพะฑ ะธัั‡ะตะทะฝะพะฒะตะฝะธะธ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ะ’ั‹ะฟะพะปะฝัะตั‚ัั ะฟะพัะปะตัƒัั‚ะฐะฝะพะฒะพั‡ะฝั‹ะน ั‚ั€ะธะณะณะตั€ %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ะžั‚ััƒั‚ัั‚ะฒัƒะตั‚ ะบะฐั‚ะฐะปะพะณ ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ะะต ัƒะดะฐะปะพััŒ ะพั‚ะบั€ั‹ั‚ัŒ ั„ะฐะนะป ยซ%sยป"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ะŸะพะดะณะพั‚ะฐะฒะปะธะฒะฐะตั‚ัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ะ ะฐัะฟะฐะบะพะฒั‹ะฒะฐะตั‚ัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ะŸะพะดะณะพั‚ะฐะฒะปะธะฒะฐะตั‚ัั ะดะปั ะฝะฐัั‚ั€ะพะนะบะธ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ะฃัั‚ะฐะฝะพะฒะปะตะฝ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ะŸะพะดะณะพั‚ะฐะฒะปะธะฒะฐะตั‚ัั ะดะปั ัƒะดะฐะปะตะฝะธั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ะฃะดะฐะปั‘ะฝ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ะŸะพะดะณะพั‚ะพะฒะบะฐ ะบ ะฟะพะปะฝะพะผัƒ ัƒะดะฐะปะตะฝะธัŽ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s ะฟะพะปะฝะพัั‚ัŒัŽ ัƒะดะฐะปั‘ะฝ"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ะะต ัƒะดะฐะปะพััŒ ะทะฐะฟะธัะฐั‚ัŒ ะฒ ะถัƒั€ะฝะฐะป, ะฝะตัƒะดะฐั‡ะฝะพะต ะฒั‹ะฟะพะปะฝะตะฝะธะต openpty() (/dev/pts ะฝะต "
 "ัะผะพะฝั‚ะธั€ะพะฒะฐะฝ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "ะ—ะฐะฟัƒัะบะฐะตั‚ัั dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "ะ”ะตะนัั‚ะฒะธะต ะฟั€ะตั€ะฒะฐะฝะพ ะดะพ ะตะณะพ ะทะฐะฒะตั€ัˆะตะฝะธั"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "ะžั‚ั‡ั‘ั‚ั‹ apport ะฝะต ะทะฐะฟะธัะฐะฝั‹, ั‚ะฐะบ ะดะพัั‚ะธะณะฝัƒั‚ MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "ะฟั€ะพะฑะปะตะผั‹ ั ะทะฐะฒะธัะธะผะพัั‚ัะผะธ โ€” ะพัั‚ะฐะฒะปัะตะผ ะฝะตะฝะฐัั‚ั€ะพะตะฝะฝั‹ะผ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3484,7 +3516,7 @@ msgstr ""
 "ะžั‚ั‡ั‘ั‚ั‹ apport ะฝะต ะทะฐะฟะธัะฐะฝั‹, ั‚ะฐะบ ะบะฐะบ ัะพะพะฑั‰ะตะฝะธะต ะพะฑ ะพัˆะธะฑะบะต ัƒะบะฐะทั‹ะฒะฐะตั‚ ะฝะฐ "
 "ะฟะพะฒั‚ะพั€ะฝัƒัŽ ะพัˆะธะฑะบัƒ ะพั‚ ะฟั€ะตะดั‹ะดัƒั‰ะตะณะพ ะพั‚ะบะฐะทะฐ."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3500,15 +3532,7 @@ msgstr ""
 "ะžั‚ั‡ั‘ั‚ั‹ apport ะฝะต ะทะฐะฟะธัะฐะฝั‹, ั‚ะฐะบ ะบะฐะบ ะฟะพะปัƒั‡ะตะฝะพ ัะพะพะฑั‰ะตะฝะธะต ะพะฑ ะพัˆะธะฑะบะต ะพ ะฝะตั…ะฒะฐั‚ะบะต "
 "ะฟะฐะผัั‚ะธ"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"ะžั‚ั‡ั‘ั‚ apport ะฝะต ัะพะทะดะฐะฝ, ั‚ะฐะบ ะบะฐะบ ัะพะพะฑั‰ะตะฝะธะต ะพะฑ ะพัˆะธะฑะบะต ัะฒะธะดะตั‚ะตะปัŒัั‚ะฒัƒะตั‚ ะพ "
-"ะฝะตะธัะฟั€ะฐะฒะฝะพัั‚ะธ ะฒ ะปะพะบะฐะปัŒะฝะพะน ัะธัั‚ะตะผะต."
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3545,22 +3569,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "ะะต ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝ"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "ะงั‚ะพ-ั‚ะพ ัั‚ั€ะฐะฝะฝะพะต ะฟั€ะพะธะทะพัˆะปะพ ะฟั€ะธ ะพะฟั€ะตะดะตะปะตะฝะธะธ ยซ%s:%sยป (%i - %s)"
-
-#~ msgid "..."
-#~ msgstr "โ€ฆ"
-
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%sโ€ฆ %u%%"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "ะŸั€ะพะธะทะพัˆะปะฐ ะพัˆะธะฑะบะฐ ะฟั€ะธ ะฟั€ะพะฒะตั€ะบะต ะฟะพะดะฟะธัะธ. ะ ะตะฟะพะทะธั‚ะพั€ะธะน ะฝะต ะพะฑะฝะพะฒะปั‘ะฝ ะธ ะฑัƒะดัƒั‚ "
-#~ "ะธัะฟะพะปัŒะทะพะฒะฐะฝั‹ ะฟั€ะตะดั‹ะดัƒั‰ะธะต ะธะฝะดะตะบัะฝั‹ะต ั„ะฐะนะปั‹. ะžัˆะธะฑะบะฐ GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "ะคะฐะนะป %s ะฝะต ะฝะฐั‡ะธะฝะฐะตั‚ัั ั ะฟั€ะพะทั€ะฐั‡ะฝะพ ะฟะพะดะฟะธัะฐะฝะฝะพะณะพ ัะพะพะฑั‰ะตะฝะธั"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ะŸั€ะพะฟัƒัะบะฐะตั‚ัั ะฝะตััƒั‰ะตัั‚ะฒัƒัŽั‰ะธะน ั„ะฐะนะป %s"
diff --git a/po/sk.po b/po/sk.po
index bda938320..901db71f9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masรกr <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -98,74 +98,74 @@ msgstr "Celkom priradenรฉho miesta: "
 msgid "Package file %s is out of sync."
 msgstr "Sรบbor balรญkov %s je neaktuรกlny."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Neboli nรกjdenรฉ ลพiadne balรญky"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Musรญte zadaลฅ aspoลˆ jeden vyhฤพadรกvacรญ vzor"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Tento prรญkaz je zavrhovanรฝ. Prosรญm, pouลพite namiesto neho โ€žapt-mark "
 "showautoโ€œ."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nedรก sa nรกjsลฅ balรญk %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Sรบbory balรญka:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Vyrovnรกvacia pamรคลฅ je neaktuรกlna, nedรก sa odvolaลฅ na sรบbor balรญka"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pripevnenรฉ balรญky:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(nenรกjdenรฉ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Nainลกtalovanรก verzia: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidรกt: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ลพiadna)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Pripevnenรฝ balรญk:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Tabuฤพka verziรญ:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pre %s skompilovanรฝ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,20 +236,28 @@ msgstr ""
 "ฤŽalลกie informรกcie nรกjdete v manuรกlovรฝch strรกnkach apt-cache(8)\n"
 "a apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Prosรญm, zadajte nรกzov tohto disku, naprรญklad โ€žDebian 5.0.3 Disk 1โ€œ"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vloลพte disk do mechaniky a stlaฤte Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Pripojenie โ€ž%sโ€œ na โ€ž%sโ€œ zlyhalo"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Zopakujte tento postup pre vลกetky CD v sade diskov."
 
@@ -484,7 +492,7 @@ msgstr "Nie je moลพnรก reinลกtalรกcia %s, pretoลพe sa nedรก stiahnuลฅ.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s je uลพ najnovลกej verzie.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je oznaฤenรฝ ako manuรกlne nainลกtalovanรฝ.\n"
@@ -593,8 +601,8 @@ msgstr "Po tejto operรกcii sa na disku pouลพije ฤalลกรญch %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tejto operรกcii sa na disku uvoฤพnรญ %sB.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedรก zistiลฅ veฤพkosลฅ voฤพnรฉho miesta"
@@ -633,7 +641,7 @@ msgstr "Preruลกenรฉ."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokraฤovaลฅ [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
@@ -642,7 +650,7 @@ msgstr "Zlyhalo stiahnutie %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Niektorรฉ sรบbory sa nedajรบ stiahnuลฅ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Sลฅahovanie ukonฤenรฉ v reลพime โ€žiba stiahnuลฅโ€œ"
 
@@ -729,7 +737,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Nasledovnรฉ informรกcie vรกm moลพno pomรดลพu vyrieลกiลฅ tรบto situรกciu:"
 
@@ -785,7 +793,7 @@ msgstr ""
 "Nesplnenรฉ zรกvislosti. Skรบste spustiลฅ โ€žapt-get -f installโ€œ bez balรญkov (alebo "
 "navrhnite rieลกenie)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -797,33 +805,33 @@ msgstr ""
 "poลพadovanรฉ balรญky eลกte neboli vytvorenรฉ alebo presunutรฉ z fronty\n"
 "Novoprichรกdzajรบcich (Incoming) balรญkov."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Poลกkodenรฉ balรญky"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Nainลกtalujรบ sa nasledovnรฉ extra balรญky:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Navrhovanรฉ balรญky:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Odporรบฤanรฉ balรญky:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balรญk %s sa nedรก nรกjsลฅ"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je oznaฤenรฝ ako automaticky nainลกtalovanรฝ.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -831,46 +839,46 @@ msgstr ""
 "Tento prรญkaz je zavrhovanรฝ. Prosรญm, pouลพite namiesto neho โ€žapt-mark autoโ€œ a "
 "โ€žapt-mark manualโ€œ."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Prepoฤรญtava sa aktualizรกcia... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Chyba"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnรบtornรก chyba, โ€žproblem resolverโ€œ nieฤo pokazil"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Adresรกr pre sลฅahovanie sa nedรก zamknรบลฅ"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Nie je moลพnรฉ nรกjsลฅ zdroj na stiahnutie verzie โ€ž%sโ€œ balรญka โ€ž%sโ€œ"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Sลฅahuje sa %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musรญte zadaลฅ aspoลˆ jeden balรญk, pre ktorรฝ sa stiahnu zdrojovรฉ texty"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedรก sa nรกjsลฅ zdrojovรฝ balรญk pre %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -880,7 +888,7 @@ msgstr ""
 "adrese:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -892,70 +900,70 @@ msgstr ""
 "ak chcete zรญskaลฅ najnovลกie (a pravdepodobne zatiaฤพ nevydanรฉ) aktualizรกcie "
 "balรญka.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa uลพ stiahnutรฝ sรบbor โ€ž%sโ€œ\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemรกte dostatok voฤพnรฉho miesta"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Je potrebnรฉ stiahnuลฅ %sB/%sB zdrojovรฝch archรญvov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Je potrebnรฉ stiahnuลฅ %sB zdrojovรฝch archรญvov.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuลฅ zdroj %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorรฝch archรญvov."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Preskakuje sa rozbalenie uลพ rozbalenรฉho zdroja v %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Prรญkaz na rozbalenie โ€ž%sโ€œ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Skontrolujte, ฤi je nainลกtalovanรฝ balรญk โ€ždpkg-devโ€œ.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Prรญkaz na zostavenie โ€ž%sโ€œ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musรญte zadaลฅ aspoลˆ jeden balรญk, pre ktorรฝ sa budรบ overovaลฅ zรกvislosti na "
 "zostavenie"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -964,17 +972,17 @@ msgstr ""
 "Informรกcie o architektรบre nie sรบ dostupnรฉ pre %s. Informรกcie o nastavenรญ "
 "nรกjdete v apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nedajรบ sa zรญskaลฅ zรกvislosti na zostavenie %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemรก ลพiadne zรกvislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -983,20 +991,20 @@ msgstr ""
 "%s zรกvislosลฅ pre %s nemoลพno splniลฅ, pretoลพe %s nie je povolenรฉ na balรญkoch "
 "โ€ž%sโ€œ"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s zรกvislosลฅ pre %s nemoลพno splniลฅ, pretoลพe sa nedรก nรกjsลฅ balรญk %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Zlyhalo splnenie %s zรกvislosti pre %s: Inลกtalovanรฝ balรญk %s je prรญliลก novรฝ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1005,7 +1013,7 @@ msgstr ""
 "%s zรกvislosลฅ pre %s nemoลพno splniลฅ, pretoลพe kandidรกtska verzia balรญka %s, "
 "nedokรกลพe splniลฅ poลพiadavky na verziu"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1013,30 +1021,30 @@ msgid ""
 msgstr ""
 "%s zรกvislosลฅ pre %s nemoลพno splniลฅ, pretoลพe balรญk %s nemรก kandidรกtsku verziu"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s zรกvislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Zรกvislosti na zostavenie %s nemoลพno splniลฅ."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie zรกvislostรญ na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Zรกznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Podporovanรฉ moduly:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1124,7 +1132,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tento APT mรก schopnosti posvรคtnej kravy.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1199,7 +1207,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s bol uลพ nastavenรฝ na nepodrลพanie.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ฤŒakalo sa na %s, ale nebolo to tam"
@@ -1356,8 +1365,8 @@ msgstr "Uplynul ฤas spojenia"
 msgid "Server closed the connection"
 msgstr "Server ukonฤil spojenie"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Chyba pri ฤรญtanรญ"
 
@@ -1370,8 +1379,8 @@ msgid "Protocol corruption"
 msgstr "Naruลกenie protokolu"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Chyba pri zรกpise"
 
@@ -1425,7 +1434,7 @@ msgstr "Uplynulo spojenie dรกtovรฉho socketu"
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedรก prijaลฅ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problรฉm s haลกovanรญm sรบboru"
 
@@ -1452,85 +1461,98 @@ msgstr "Dotaz"
 msgid "Unable to invoke "
 msgstr "Nedรก sa vyvolaลฅ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Pripรกja sa k %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nedรก sa vytvoriลฅ socket pre %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nedรก sa nadviazaลฅ spojenie na %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nedรก sa pripojiลฅ k %s:%s (%s), uplynul ฤas spojenia"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nedรก sa pripojiลฅ k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripรกja sa k %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie je moลพnรฉ preloลพiลฅ โ€ž%sโ€œ"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Doฤasnรฉ zlyhanie pri preklade โ€ž%sโ€œ"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Nieฤo veฤพmi zlรฉ sa prihodilo pri preklade โ€ž%s:%sโ€œ (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Nieฤo veฤพmi zlรฉ sa prihodilo pri preklade โ€ž%s:%sโ€œ (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nedรก sa pripojiลฅ k %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnรบtornรก chyba: Sprรกvna signatรบra, ale sa nedรก zistiลฅ odtlaฤok kฤพรบฤa?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistenรก aspoลˆ jedna nesprรกvna signatรบra."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nedรก sa spustiลฅ โ€žgpgvโ€œ kvรดli overeniu podpisu (je nainลกtalovanรฉ gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Neznรกma chyba pri spustenรญ gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovnรฉ signatรบry sรบ neplatnรฉ:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1570,53 +1592,53 @@ msgstr "Tento HTTP server mรก poลกkodenรบ podporu rozsahov"
 msgid "Unknown date format"
 msgstr "Neznรกmy formรกt dรกtumu"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Vรฝber zlyhal"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Uplynul ฤas spojenia"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Chyba zรกpisu do vรฝstupnรฉho sรบboru"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Chyba zรกpisu do sรบboru"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Chyba zรกpisu do tohto sรบboru"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri ฤรญtanรญ zo servera. Druhรก strana ukonฤila spojenie"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Chyba pri ฤรญtanรญ zo servera"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Zlรฉ dรกtovรฉ zรกhlavie"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Vnรบtornรก chyba"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedรก sa naฤรญtaลฅ %s"
@@ -1643,7 +1665,12 @@ msgstr "Na zrkadle nebol nรกjdenรฝ sรบbor โ€ž%sโ€œ"
 msgid "Can not read mirror file '%s'"
 msgstr "Nepodarilo sa preฤรญtaลฅ sรบbor โ€ž%sโ€œ na zrkadle"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Nepodarilo sa preฤรญtaลฅ sรบbor โ€ž%sโ€œ na zrkadle"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Zrkadlo: %s]"
@@ -1739,7 +1766,7 @@ msgstr ""
 "  -c=? Naฤรญta tento konfiguraฤnรฝ sรบbor\n"
 "  -o=? Nastavรญ ฤพubovoฤพnรบ voฤพbu, napr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Do %s sa nedรก zapisovaลฅ"
@@ -1884,8 +1911,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Nedรก sa otvoriลฅ DB sรบbor %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s sa nedรก vyhodnotiลฅ"
@@ -1898,87 +1925,87 @@ msgstr "Archรญv nemรก riadiaci zรกznam"
 msgid "Unable to get a cursor"
 msgstr "Nedรก sa zรญskaลฅ kurzor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Adresรกr %s sa nedรก ฤรญtaลฅ\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s sa nedรก vyhodnotiลฅ\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Chyby sa tรฝkajรบ sรบboru "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Chyba pri preklade %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Prechod stromom zlyhal"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s sa nedรก otvoriลฅ"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Odlinkovanie %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nie je moลพnรฉ vykonaลฅ readlink %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nie je moลพnรฉ vykonaลฅ unlink %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nepodarilo sa zlinkovaลฅ %s s %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Bol dosiahnutรฝ odlinkovacรญ limit %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Archรญv neobsahuje pole โ€žpackageโ€œ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemรก ลพiadnu poloลพku override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  sprรกvcom %s je %s, nie %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemรก ลพiadnu poloลพku โ€žsource overrideโ€œ\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemรก ลพiadnu poloลพku โ€žbinary overrideโ€œ\n"
@@ -2052,7 +2079,7 @@ msgstr "Chyba ฤรญtania pri vรฝpoฤte MD5"
 msgid "Problem unlinking %s"
 msgstr "Problรฉm s odlinkovanรญm %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Premenovanie %s na %s zlyhalo"
@@ -2109,23 +2136,23 @@ msgstr ""
 "  -c=? Naฤรญta tento konfiguraฤnรฝ sรบbor\n"
 "  -o=? Nastavรญ ฤพubovoฤพnรบ voฤพbu, napr. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Vytvorenie rรบry zlyhalo"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Spustenie gzip zlyhalo "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Poruลกenรฝ archรญv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Kontrolnรฝ sรบฤet pre tar zlyhal, archรญv je poลกkodenรฝ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznรกma TAR hlaviฤka typu %u, ฤlen %s"
@@ -2196,54 +2223,54 @@ msgstr "Zรกpis sรบboru %s zlyhal"
 msgid "Failed to close file %s"
 msgstr "Zatvorenie sรบboru %s zlyhalo"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Cesta %s je prรญliลก dlhรก"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s sa rozbaฤพuje viackrรกt"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Adresรกr %s je divertovanรฝ"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Balรญk sa pokรบลกa zapisovaลฅ do diverznรฉho cieฤพa %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Diverznรก cesta je prรญliลก dlhรก"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Adresรกr %s sa nahradรญ neadresรกrom"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nedรก sa nรกjsลฅ uzol na adrese jeho haลกu"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Cesta je prรญliลก dlhรก"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Prepรญsaลฅ zodpovedajรบci balรญk bez udania verzie pre %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Sรบbor %s/%s prepisuje ten z balรญka %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nedรก sa vyhodnotiลฅ %s"
@@ -2324,30 +2351,30 @@ msgstr ""
 "pouลพรญvateฤพ."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%li d %li h %li min %li s"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%li h %li min %li s"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%li min %li s"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Voฤพba %s nenรกjdenรก"
@@ -2419,6 +2446,16 @@ msgstr "%c%s... Chyba!"
 msgid "%c%s... Done"
 msgstr "%c%s... Hotovo"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hotovo"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2479,115 +2516,121 @@ msgstr "Nedรก sa vykonaลฅ stat() CD-ROM"
 msgid "Problem closing the gzip file %s"
 msgstr "Problรฉm pri zatvรกranรญ gzip sรบboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Zamykanie pre sรบbor zรกmku %s, ktorรฝ je iba na ฤรญtanie, sa nepouลพรญva"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Sรบbor zรกmku %s sa nedรก otvoriลฅ"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Zamykanie pre sรบbor zรกmku %s pripojenรฝ cez NFS sa nepouลพรญva"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Zรกmok %s sa nedรก zรญskaลฅ"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "Zoznam sรบborov nemoลพno vytvoriลฅ, pretoลพe โ€ž%sโ€œ nie je adresรกr"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignoruje sa โ€ž%sโ€œ v adresรกri โ€ž%sโ€œ, pretoลพe to nie je obyฤajnรฝ sรบbor"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ignoruje sa โ€ž%sโ€œ v adresรกri โ€ž%sโ€œ, pretoลพe nemรก prรญponu nรกzvu sรบboru"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "Ignoruje sa โ€ž%sโ€œ v adresรกri โ€ž%sโ€œ, pretoลพe mรก neplatnรบ prรญponu nรกzvu sรบboru"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdrลพal chybu segmentรกcie."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s dostal signรกl %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrรกtil chybovรฝ kรณd (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neoฤakรกvane skonฤil"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nedรก sa otvoriลฅ sรบbor %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nedรก sa otvoriลฅ popisovaฤ sรบboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Nedรก sa vytvoriลฅ podproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Nepodarilo sa spustiลฅ kompresor "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "ฤรญtanie, treba preฤรญtaลฅ eลกte %llu, ale uลพ niฤ neostรกva"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "zรกpis, treba zapรญsaลฅ eลกte %llu, no nedรก sa to"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problรฉm pri zatvรกranรญ sรบboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problรฉm pri synchronizovanรญ sรบboru %s na %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problรฉm pri odstraลˆovanรญ sรบboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problรฉm pri synchronizovanรญ sรบboru"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainลกtalovanรฝ ลพiaden zvรคzok kฤพรบฤov."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Vyrovnรกvacia pamรคลฅ balรญkov je prรกzdna"
@@ -2613,59 +2656,59 @@ msgstr "Tento APT nepodporuje systรฉm na sprรกvu verziรญ โ€ž%sโ€œ"
 msgid "The package cache was built for a different architecture"
 msgstr "Sรบbor vyrovnรกvacej pamรคti balรญkov bol vytvorenรฝ pre inรบ architektรบru"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Zรกvisรญ na"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Predzรกvisรญ na"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Odporรบฤa"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Nahrรกdza"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Zneplatลˆuje"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Kazรญ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Rozลกiruje"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "dรดleลพitรฝ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "poลพadovanรฝ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ลกtandardnรฝ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "voliteฤพnรฝ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2766,17 +2809,17 @@ msgstr "Otvรกra sa %s"
 msgid "Line %u too long in source list %s."
 msgstr "Riadok %u v zozname zdrojov %s je prรญliลก dlhรฝ."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Skomolenรฝ riadok %u v zozname zdrojov %s (typ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ โ€ž%sโ€œ je neznรกmy na riadku %u v zozname zdrojov %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2785,12 +2828,12 @@ msgstr ""
 "Nebolo moลพnรฉ vykonaลฅ okamลพitรบ konfigurรกciu โ€ž%sโ€œ. Pozri prosรญm podrobnosti v "
 "man 5 apt.conf pod APT::Immediate-Configure (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Nedรก sa nakonfigurovaลฅ โ€ž%sโ€œ."
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2812,7 +2855,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Je nutnรฉ preinลกtalovaลฅ balรญk %s, ale nedรก sa nรกjsลฅ jeho archรญv."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2820,11 +2863,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytvรกra poruchy, ฤo mรดลพe bรฝt spรดsobenรฉ "
 "pridrลพanรฝmi balรญkmi."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Problรฉmy sa nedajรบ opraviลฅ, niektorรฉ balรญky drลพรญte v poลกkodenom stave."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2832,7 +2875,7 @@ msgstr ""
 "Niektorรฉ indexovรฉ sรบbory sa nepodarilo stiahnuลฅ. Boli ignorovanรฉ alebo sa "
 "pouลพili starลกie verzie."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Adresรกr zoznamov %spartial chรฝba."
@@ -2869,17 +2912,17 @@ msgstr "Nedรก sa nรกjsลฅ ovlรกdaฤ spรดsobu %s."
 msgid "Method %s did not start correctly"
 msgstr "Spรดsob %s nebol sprรกvne spustenรฝ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vloลพte disk nazvanรฝ โ€ž%sโ€œ do mechaniky โ€ž%sโ€œ a stlaฤte Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Systรฉm balรญkov โ€ž%sโ€œ nie je podporovanรฝ"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nedรก sa urฤiลฅ vhodnรฝ typ systรฉmu balรญkov"
 
@@ -2934,14 +2977,14 @@ msgstr "Vyrovnรกvacia pamรคลฅ mรก nezluฤiteฤพnรฝ systรฉm na sprรกvu verziรญ"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Vyskytla sa chyba pri spracovรกvanรญ %s (%s%d)"
@@ -2964,26 +3007,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Fรญha, prekroฤili ste poฤet zรกvislostรญ, ktorรฉ toto APT zvlรกdne spracovaลฅ."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pri spracovanรญ zรกvislostรญ nebol nรกjdenรฝ balรญk %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nedรก sa vyhodnotiลฅ zoznam zdrojovรฝch balรญkov %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Naฤรญtavajรบ sa zoznamy balรญkov"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "V/V chyba pri ukladanรญ zdrojovej vyrovnรกvacej pamรคti"
 
@@ -2996,12 +3039,12 @@ msgstr "premenovanie zlyhalo, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Nezhoda kontrolnรฝch MD5 sรบฤtov"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Nezhoda kontrolnรฝch haลก sรบฤtov"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3010,16 +3053,16 @@ msgstr ""
 "Nepodarilo sa nรกjsลฅ oฤakรกvanรบ poloลพku โ€ž%sโ€œ v sรบbore Release (Nesprรกvna "
 "poloลพka sources.list alebo chybnรฝ formรกt sรบboru)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nepodarilo sa nรกjsลฅ haลก โ€ž%sโ€œ v sรบbore Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nie sรบ dostupnรฉ ลพiadne verejnรฉ kฤพรบฤe ku kฤพรบฤom s nasledovnรฝmi ID:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3028,27 +3071,27 @@ msgstr ""
 "Sรบbor Release pre %s vyprลกal (neplatnรฝ od %s). Aktualizรกcie tohto zdroja "
 "softvรฉru sa nepouลพijรบ."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "V konflikte s distribรบciou: %s (oฤakรกvalo sa %s ale dostali sme %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Poฤas overovania podpisu sa vyskytla chyba. Repozitรกr nie je aktualizovanรฝ a "
 "pouลพijรบ sa predoลกlรฉ indexovรฉ sรบbory. Chyba GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3057,7 +3100,7 @@ msgstr ""
 "Nedรก sa nรกjsลฅ sรบbor s balรญkom %s. To by mohlo znamenaลฅ, ลพe tento balรญk je "
 "potrebnรฉ opraviลฅ manuรกlne (kvรดli chรฝbajรบcej architektรบre)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3066,37 +3109,37 @@ msgstr ""
 "Nedรก sa nรกjsลฅ sรบbor s balรญkom %s. Asi budete musieลฅ opraviลฅ tento balรญk "
 "manuรกlne."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Indexovรฉ sรบbory balรญka sรบ naruลกenรฉ. Chรฝba pole Filename: pre balรญk %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Veฤพkosti sa nezhodujรบ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nedรก spracovaลฅ sรบbor Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "ลฝiadne sekcie v Release sรบbore %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Chรฝba poloลพka โ€žHashโ€œ v sรบbore Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Chรฝba poloลพka โ€žValid-Untilโ€œ v sรบbore Release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Chรฝba poloลพka โ€žDateโ€œ v sรบbore Release %s"
@@ -3124,7 +3167,7 @@ msgstr "Identifikuje sa.."
 msgid "Stored label: %s\n"
 msgstr "Uloลพenรก menovka: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM sa odpรกja...\n"
 
@@ -3188,30 +3231,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopรญrujรบ sa zoznamy balรญkov..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Zapisuje sa novรฝ zoznam zdrojov\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Poloลพky zoznamu zdrojov pre tento disk sรบ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapรญsanรฝch %i zรกznamov.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapรญsanรฝch %i zรกznamov s %i chรฝbajรบcimi sรบbormi.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapรญsanรฝch %i zรกznamov s %i chybnรฝmi sรบbormi\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapรญsanรฝch %i zรกznamov s %i chรฝbajรบcimi a %i chybnรฝmi sรบbormi\n"
@@ -3226,17 +3269,6 @@ msgstr "Nebolo moลพnรฉ nรกjsลฅ autentifikaฤnรฝ zรกznam pre: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Nezhoda kontrolnรฝch haลก sรบฤtov: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Sรบbor %s nezaฤรญna podpรญsanou sprรกvou v ฤistom texte (clearsigned)"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainลกtalovanรฝ ลพiaden zvรคzok kฤพรบฤov."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3307,115 +3339,115 @@ msgstr "Pripraviลฅ sa na prijatie rieลกenia"
 msgid "External solver failed without a proper error message"
 msgstr "Externรฝ rieลกiteฤพ zlyhal bez uvedenia chybovej sprรกvy"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Spustiลฅ externรฉho rieลกiteฤพa"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Inลกtaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraลˆuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "รšplne sa odstraลˆuje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Zaznamenali sme zmiznutie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Vykonรกva sa spรบลกลฅaฤ post-installation %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresรกr โ€ž%sโ€œ chรฝba"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nedรก sa otvoriลฅ sรบbor โ€ž%sโ€œ"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaฤพuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Nainลกtalovanรฝ balรญk %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravuje sa odstrรกnenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Odstrรกnenรฝ balรญk %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravuje sa รบplnรฉ odstrรกnenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Balรญk โ€ž%sโ€œ je รบplne odstrรกnenรฝ"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nedรก sa zapรญsaลฅ zรกznam, volanie openpty() zlyhalo (/dev/pts nie je "
 "pripojenรฝ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Spรบลกลฅa sa dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Operรกcia bola preruลกenรก predtรฝm, neลพ sa stihla dokonฤiลฅ"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nezapรญลกe sa sprรกva apport, pretoลพe uลพ bol dosiahnutรฝ limit MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problรฉm so zรกvislosลฅami - ponechรกva sa nenakonfigurovanรฉ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3423,7 +3455,7 @@ msgstr ""
 "Nezapรญลกe sa sprรกva apport, pretoลพe chybovรก sprรกva indikuje, ลพe je to chyba v "
 "nadvรคznosti na predoลกlรฉ zlyhanie."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3439,13 +3471,7 @@ msgstr ""
 "Nezapรญลกe sa sprรกva apport, pretoลพe chybovรก sprรกva indikuje chybu nedostatku "
 "pamรคte"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3475,20 +3501,8 @@ msgstr "dpkg bol preruลกenรฝ, musรญte ruฤne opraviลฅ problรฉm spustenรญm โ€ž%sโ
 msgid "Not locked"
 msgstr "Nie je zamknutรฉ"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Nieฤo veฤพmi zlรฉ sa prihodilo pri preklade โ€ž%s:%sโ€œ (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Hotovo"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Poฤas overovania podpisu sa vyskytla chyba. Repozitรกr nie je "
-#~ "aktualizovanรฝ a pouลพijรบ sa predoลกlรฉ indexovรฉ sรบbory. Chyba GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Sรบbor %s nezaฤรญna podpรญsanou sprรกvou v ฤistom texte (clearsigned)"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Preskakuje sa neexistujรบci sรบbor %s"
diff --git a/po/sl.po b/po/sl.po
index 2ab683a72..91cbe9aee 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -98,72 +98,72 @@ msgstr "Celotna velikost, izraฤunana za: "
 msgid "Package file %s is out of sync."
 msgstr "Datoteka paketa %s ni usklajena."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Noben paket ni bil najden"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Podati morate vsaj en iskalni vzorec"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni mogoฤe najti paketa %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoฤ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ni najdeno)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Nameลกฤen: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(brez)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Bucika paketa: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Preglednica razliฤic:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s za %s kodno preveden na %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -234,20 +234,28 @@ msgstr ""
 "Za veฤ podrobnosti si oglejte strani priroฤnikov apt-cache(8) in apt.conf"
 "(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Priklapljanje '%s' na '%s' je spodletelo"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ponovi to opravilo za preostanek CD-jev v vaลกi zbirki."
 
@@ -481,7 +489,7 @@ msgstr "Ponovna namestitev %s ni moลพna, ker prejem ni moลพen.\n"
 msgid "%s is already the newest version.\n"
 msgstr "Najnovejลกa razliฤica %s je ลพe nameลกฤena.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je bil nastavljen na roฤno nameลกฤen.\n"
@@ -590,8 +598,8 @@ msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tem opravilu bo sproลกฤenega %sB prostora na disku.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ni mogoฤe doloฤiti prostega prostora v %s"
@@ -630,7 +638,7 @@ msgstr "Prekini."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ali ลพelite nadaljevati [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogoฤe dobiti %s  %s\n"
@@ -639,7 +647,7 @@ msgstr "Ni mogoฤe dobiti %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Prejem nekaterih datotek ni uspel"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Prejem je dokonฤan in uporabljen je naฤin samo prejema"
 
@@ -732,7 +740,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali reลกiti teลพavo:"
 
@@ -786,7 +794,7 @@ msgstr ""
 "Nereลกene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "navedite reลกitev)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -798,33 +806,33 @@ msgstr ""
 ", da nekateri zahtevani paketi ลกe niso ustvarjeni ali premaknjeni\n"
 " iz Prihajajoฤega."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo nameลกฤeni:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Priporoฤeni paketi:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogoฤe najti paketa %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je nastavljen na samodejno nameลกฤen.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -832,47 +840,47 @@ msgstr ""
 "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark "
 "manual'."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Preraฤunavanje nadgradnje ... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Opravljeno"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka, reลกevalnik teลพav je pokvaril stvari"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Ni mogoฤe zakleniti mape prejemov"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Ni mogoฤe najti vira za prejem razliฤice '%s' paketa '%s'"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Prejemanje %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ลพelite dobiti izvorno kodo"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogoฤe najti"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -881,7 +889,7 @@ msgstr ""
 "OPOMBA: pakiranje '%s' vzdrลพevano v sistemu nadzora razliฤice '%s' na:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -892,70 +900,70 @@ msgstr ""
 "bzr branch %s\n"
 "za pridobitev zadnjih (morda ลกe neizdanih) posodobitev paketa.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskok ลพe prejete datoteke '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoฤe pridobiti."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Odpakiranje ลพe odpakiranih izvornih paketov v %s je bilo preskoฤeno\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Izberite, ฤe je paket 'dpkg-dev' nameลกฤen.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Podrejeno opravilo ni uspelo"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ลพelite preveriti odvisnosti "
 "za gradnjo"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -964,17 +972,17 @@ msgstr ""
 "Za %s ni bilo mogoฤe najti podatkov o arhitekturi. Za nastavitev si oglejte "
 "apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni mogoฤe dobiti podrobnosti o odvisnostih za gradnjo za %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -982,20 +990,20 @@ msgid ""
 msgstr ""
 "odvisnosti %s za %s ni mogoฤe zadovoljiti, ker %s ni dovoljen na paketih '%s'"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s odvisnosti za %s ni mogoฤe zadostiti, ker ni mogoฤe najti paketa %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Ni mogoฤe zadostiti %s odvisnosti za %s. Nameลกฤen paket %s je preveฤ nov"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1004,7 +1012,7 @@ msgstr ""
 "odvisnosti %s za %s ni mogoฤe zadovoljiti, ker je razliฤica kandidata paketa "
 "%s ne more zadostiti zahtev razliฤice"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1013,30 +1021,30 @@ msgstr ""
 "odvisnosti %s za %s ni mogoฤe zadovoljiti, ker je razliฤica kandidata paketa "
 "%s nima razliฤice kandidata"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Ni mogoฤe zadostiti %s odvisnosti za %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnosti za gradnjo %s ni bilo mogoฤe zadostiti."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dnevnik sprememb za %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1123,7 +1131,7 @@ msgstr ""
 " sources.list(5) in apt.conf(5). \n"
 "                       Ta APT ima moฤi super krav.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1198,7 +1206,8 @@ msgid "%s was already not hold.\n"
 msgstr "paket %s je bil ลพe nastavljen kot ne na ฤakanju.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Program je ฤakal na %s a ga ni bilo tam"
@@ -1354,8 +1363,8 @@ msgstr "Povezava je zakasnela"
 msgid "Server closed the connection"
 msgstr "Streลพnik je zaprl povezavo"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Napaka branja"
 
@@ -1368,8 +1377,8 @@ msgid "Protocol corruption"
 msgstr "Okvara protokola"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Napaka pisanja"
 
@@ -1423,7 +1432,7 @@ msgstr "Povezava podatkovne vtiฤnice je zakasnela"
 msgid "Unable to accept connection"
 msgstr "Ni mogoฤe sprejeti povezave"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Teลพava med razprลกevanjem datoteke"
 
@@ -1450,86 +1459,99 @@ msgstr "Poizvedba"
 msgid "Unable to invoke "
 msgstr "Ni mogoฤe klicati "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Povezovanje z %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Ni mogoฤe ustvariti vtiฤa za %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni mogoฤe zaฤeti povezave z %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Ni se mogoฤe povezati z %s:%s (%s). Povezava je zakasnela."
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ni se mogoฤe povezati z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezovanje z %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ni mogoฤe razreลกiti '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Zaฤasna napaka med razreลกevanjem '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Nekaj ฤudnega se je zgodilo med razreลกevanjem '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Nekaj ฤudnega se je zgodilo med razreลกevanjem '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ni se mogoฤe povezati z %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Notranja napaka: Dober podpis, toda ni mogoฤe doloฤiti podpisa kljuฤa?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Najden je bil vsaj en neveljaven podpis."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Ni mogoฤe izvesti 'gpgv' za preverjanje podpisa (je gpgv nameลกฤen?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Neznana napaka med izvajanjem gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji podpisi so bili neveljavni:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1568,53 +1590,53 @@ msgstr "Ta streลพnik HTTP ima pokvarjen obseg podpore"
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Povezava je zakasnela"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka med branjem s streลพnika. Oddaljeni del je zaprl povezavo"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Napaka med branjem s streลพnika"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Napaฤni podatki glave"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Notranja napaka"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogoฤe brati %s"
@@ -1641,7 +1663,12 @@ msgstr "Datoteke zrcalnih streลพnikov '%s' ni mogoฤe najti "
 msgid "Can not read mirror file '%s'"
 msgstr "Datoteke zrcalnega streลพnika '%s' ni mogoฤe prebrati"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Datoteke zrcalnega streลพnika '%s' ni mogoฤe prebrati"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Zrcalni streลพnik: %s]"
@@ -1738,7 +1765,7 @@ msgstr ""
 "  -c=? Prebere podano datoteko z nastavitvami\n"
 "  -o=? Nastavi poljubno nastavitveno moลพnost, na primer. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni mogoฤe pisati na %s"
@@ -1883,8 +1910,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni mogoฤe odprti datoteke PZ %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Napaka med doloฤitvijo %s"
@@ -1897,87 +1924,87 @@ msgstr "Arhiv nima nadzornega zapisa"
 msgid "Unable to get a cursor"
 msgstr "Ni mogoฤe najti kazalke"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "O: ni mogoฤe brati mape %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "O: Ni mogoฤe doloฤiti %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "O: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "N: Napake se sklicujejo na datoteko "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Ni mogoฤe razreลกiti %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Hoja drevesa je spodletela"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Ni mogoฤe odprti %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " RazVeลพi %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Napaka med branjem povezave %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Napaka med odvezovanjem %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Napaka med povezovanjem %s in %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Doseลพena meja RazVezovanja %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arhiv ni imel polja s paketom"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nima prepisanega vnosa\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Vzdrลพevalec %s je %s in ne %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nima izvornega vnosa prepisa\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nima tudi binarnega vnosa prepisa\n"
@@ -2051,7 +2078,7 @@ msgstr "Med raฤunanjem MD5 ni mogoฤe brati"
 msgid "Problem unlinking %s"
 msgstr "Napaka med odvezovanjem %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Ni mogoฤe preimenovati %s v %s"
@@ -2110,23 +2137,23 @@ msgstr ""
 "  -c=? Prebere podano datoteko z nastavitvami\n"
 "  -o=? Nastavi poljubno nastavitveno moลพnost, npr. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Ni mogoฤe ustvariti pip"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Ni mogoฤe izvesti gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Pokvarjen arhiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznana vrsta glave TAR %u, ฤlan %s"
@@ -2197,54 +2224,54 @@ msgstr "Zapisovanje datoteke %s je spodletelo"
 msgid "Failed to close file %s"
 msgstr "Napaka med zapiranjem datoteke %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Pot %s je predolga"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Odpakiranje %s veฤ kot enkrat"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mapa %s je odklonjena"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paket poskuลกa pisati v tarฤo odklona %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Pot odklona je predloga"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Mapa %s je bil zamenjana z ne-mapo"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Iskanje vozliลกฤa v njegovem razprลกenem vedru ni uspelo"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Pot je predolga"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Prepiลกi zadetek paketa brez vnosa razliฤice za %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni mogoฤe doloฤiti %s"
@@ -2324,30 +2351,30 @@ msgstr ""
 "Ni mogoฤe poveฤati velikosti MMap, ker je samodejno poveฤevanje onemogoฤeno."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbire %s ni mogoฤe najti"
@@ -2419,6 +2446,16 @@ msgstr "%c%s ... Napaka!"
 msgid "%c%s... Done"
 msgstr "%c%s ... Narejeno"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Narejeno"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2479,115 +2516,121 @@ msgstr "Ni mogoฤe doloฤiti CD-ROM-a"
 msgid "Problem closing the gzip file %s"
 msgstr "Teลพava med zapiranjem gzip datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ni mogoฤe odprti zaklenjene datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ni mogoฤe zakleniti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "Seznama datotek ni mogoฤe ustvariti, ker '%s' ni mapa"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Preziranje '%s' v mapi '%s', ker ni obiฤajna datoteka"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Pod-opravilo %s je prejelo signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Pod-opravilo %s se je nepriฤakovano zakljuฤilo"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Ni mogoฤe odpreti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ni mogoฤe odpreti opisnika datotek %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Ni mogoฤe ustvariti podopravila IPD"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Ni mogoฤe izvesti stiskanja "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "Prebrano, ลกe vedno je treba prebrati %llu bajtov, vendar ni niฤ ostalo"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "pisanje, preostalo je ลกe %llu za pisanje, vendar ni bilo mogoฤe pisati"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Teลพava med zapiranjem datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Teลพava med preimenovanje datoteke %s v %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Teลพava med razvezovanjem datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Teลพava med usklajevanjem datoteke"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s ni nameลกฤenih zbirk kljuฤev."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Prazen predpomnilnik paketov"
@@ -2613,59 +2656,59 @@ msgstr "Ta APT ne podpira sistema razliฤic '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "Predpomnilnik paketov je bil izgrajen za drugaฤno arhitekturo"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Odvisen od"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Predodvisen od"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Priporoฤa"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Priporoฤa"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Zamenja"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Zastara"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Pokvari"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Izboljลกa"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "pomembno"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "obvezno"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "obiฤajni"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "izbirno"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "dodatno"
 
@@ -2771,17 +2814,17 @@ msgstr "Odpiranje %s"
 msgid "Line %u too long in source list %s."
 msgstr "Vrstica %u v seznamu virov %s je predolga."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2790,12 +2833,12 @@ msgstr ""
 "Ni mogoฤe izvesti takojฤ…nje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
 "APT::Immediate-Configure za podrobnosti. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Ni mogoฤe nastaviti '%s' "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2817,7 +2860,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Paket %s mora biti znova nameลกฤen, vendar ni mogoฤe najti arhiva zanj."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2825,11 +2868,11 @@ msgstr ""
 "Napaka. pkgProblemResolver::Resolve pri razreลกitvi, ki so jih morda "
 "povzroฤili zadrลพani paketi."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ni mogoฤe popraviti teลพav. Imate pokvarjene pakete."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2837,7 +2880,7 @@ msgstr ""
 "Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
 "namesto njih uporabljene stare."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Mapa seznama %spartial manjka."
@@ -2874,17 +2917,17 @@ msgstr "Gonilnika naฤinov %s ni mogoฤe najti."
 msgid "Method %s did not start correctly"
 msgstr "Naฤin %s se ni zaฤel pravilno"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketni sistem '%s' ni podprt"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni mogoฤe doloฤiti ustrezne vrste paketnega sistema"
 
@@ -2939,14 +2982,14 @@ msgstr "Predpomnilnik ima neustrezen sistem razliฤic"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Med obdelovanjem %s je priลกlo do napake (%s%d)"
@@ -2967,26 +3010,26 @@ msgstr "ฤŒestitamo, presegli ste ลกtevilo opisov, ki jih je zmoลพen APT."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "ฤŒestitamo, presegli ste ลกtevilo odvisnosti, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Paketa %s %s ni bilo mogoฤe najti med obdelavo odvisnosti datotek"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ni mogoฤe doloฤiti seznama izvornih paketov %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Branje seznama paketov"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Zbiranje dobaviteljev datotek"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
 
@@ -2999,12 +3042,12 @@ msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Neujemanje vsote MD5"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Neujemanje vsote razprลกil"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3013,16 +3056,16 @@ msgstr ""
 "Ni mogoฤe najti priฤakovanega vnosa '%s' v datoteki Release (napaฤen vnos "
 "sources.list ali slabo oblikovana datoteka)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ni mogoฤe najti vsote razprลกevanja za '%s' v datoteki Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Za naslednje ID-je kljuฤa ni na voljo javnih kljuฤev:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3031,27 +3074,27 @@ msgstr ""
 "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
 "skladiลกฤe ne bo uveljavljena."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribucija v sporu: %s (priฤakovana %s, toda dobljena %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Med preverjanjem podpisa je priลกlo do napake. Skladiลกฤe ni bilo posodobljeno "
 "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Napaka GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3060,7 +3103,7 @@ msgstr ""
 "Ni bilo mogoฤe najti datoteke za paket %s. Morda boste morali roฤno "
 "popraviti ta paket (zaradi manjkajoฤega arhiva)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3069,7 +3112,7 @@ msgstr ""
 "Ni bilo mogoฤe najti datoteke za paket %s. Morda boste morali roฤno "
 "popraviti ta paket."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3077,31 +3120,31 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
 "%s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ni mogoฤe razฤleniti Release datoteke %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ni izbir v Release datoteki %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ni vnosa razprลกila v Release datoteki %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
@@ -3129,7 +3172,7 @@ msgstr "Identificiranje ... "
 msgid "Stored label: %s\n"
 msgstr "Shranjena oznaka: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Odklapljanje CD-ROM-a ...\n"
 
@@ -3193,30 +3236,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopiranje seznama paketov ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Pisanje novega seznama virov\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Izvorni vnosi za ta disk so:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisanih je bilo %i zapisov.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapisanih je bilo %i zapisov z %i manjkajoฤimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapisanih je bilo %i zapisov z %i neujemajoฤimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3233,17 +3276,6 @@ msgstr "Ni mogoฤe najti zapisa overitve za: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Neujemanje razprลกila za: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datoteka %s se ne zaฤne s ฤisto podpisanim sporoฤilom"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s ni nameลกฤenih zbirk kljuฤev."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3311,116 +3343,116 @@ msgstr "Priprava za reลกitev prejemanja"
 msgid "External solver failed without a proper error message"
 msgstr "Zunanji reลกevalnik je spodletel brez pravega sporoฤila o napakah"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Izvedi zunanji reลกevalnik"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Nameลกฤanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Odstranjevanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s je izginil"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Poganjanje sproลพilca po namestitvi %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mapa '%s' manjka"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Ni mogoฤe odpreti datoteke '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Razลกirjanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravljanje na nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s je bil nameลกฤen"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravljanje na odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s je bil odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravljanje na popolno odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Ni mogoฤe pisati dnevnika, openpty() je spodletelo (/dev/pts ni "
 "prklopljen?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Poganjanje dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Opravilo je bilo prekinjeno preden se je lahko konฤalo"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Poroฤilo apport ni bilo napisano, ker je bilo ลกtevilo MaxReports ลพe doseลพeno"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "teลพave odvisnosti - puลกฤanje nenastavljenega"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3428,7 +3460,7 @@ msgstr ""
 "Poroฤilo apport ni bilo napisano, ker sporoฤilo o napaki nakazuje na "
 "navezujoฤo napako iz predhodne napake."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3444,15 +3476,7 @@ msgstr ""
 "Poroฤilo apport ni bilo napisano, ker sporoฤilo o napaki nakazuje na napako "
 "zaradi pomanjkanja pomnilnika"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Poroฤilo apport je bilo napisano, ker sporoฤilo o napaki nakazuje na teลพavo "
-"na krajevnem sistemu"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3484,21 +3508,8 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate roฤno pognati '%s'. "
 msgid "Not locked"
 msgstr "Ni zaklenjeno"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Nekaj ฤudnega se je zgodilo med razreลกevanjem '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s ... Narejeno"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Med preverjanjem podpisa je priลกlo do napake. Skladiลกฤe ni bilo "
-#~ "posodobljeno zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: "
-#~ "%s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Datoteka %s se ne zaฤne s ฤisto podpisanim sporoฤilom"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Preskok neobstojeฤe datoteke %s"
@@ -3578,6 +3589,13 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
+#~ msgid ""
+#~ "No apport report written because the error message indicates an issue on "
+#~ "the local system"
+#~ msgstr ""
+#~ "Poroฤilo apport je bilo napisano, ker sporoฤilo o napaki nakazuje na "
+#~ "teลพavo na krajevnem sistemu"
+
 #~ msgid "Malformed override %s line %lu #1"
 #~ msgstr "Napaฤno oblikovana prepisana vrstica %s %lu #1"
 
diff --git a/po/sv.po b/po/sv.po
index c724c1d86..b7502b6cd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2010-08-24 21:18+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -98,72 +98,72 @@ msgstr "Totalt utrymme som kan redogรถras fรถr: "
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s รคr inte synkroniserad."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Inga paket hittades"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Du mรฅste ange minst ett sรถkmรถnster"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Detta kommando รคr fรถrรฅldrat. Anvรคnd \"apt-mark showauto\" istรคllet."
+msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cachen รคr inte synkroniserad, kan inte korsreferera en paketfil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Fastnรฅlade paket:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(hittades inte)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Paketnรฅlning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s fรถr %s kompilerad den %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,20 +237,28 @@ msgstr ""
 "  -o=? Stรคll in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 "Se manualsidorna fรถr apt-cache(8) och apt.conf(5) fรถr mer information.\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Ange ett namn fรถr denna skiva, exempelvis \"Debian 5.0.3 Disk 1\""
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mata in en skiva i enheten och tryck pรฅ Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Misslyckades med att montera \"%s\" till \"%s\""
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Upprepa proceduren fรถr resten av cd-skivorna i din uppsรคttning."
 
@@ -292,7 +300,7 @@ msgstr "J"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -486,7 +494,7 @@ msgstr "Ominstallation av %s รคr inte mรถjlig, det kan inte hรคmtas.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s รคr redan den senaste versionen.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s รคr satt till manuellt installerad.\n"
@@ -596,8 +604,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denna รฅtgรคrd kommer %sB att frigรถras pรฅ disken.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte faststรคlla ledigt utrymme i %s"
@@ -637,7 +645,7 @@ msgstr "Avbryter."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vill du fortsรคtta [J/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hรคmta %s  %s\n"
@@ -646,7 +654,7 @@ msgstr "Misslyckades med att hรคmta %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hรคmta vissa filer"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Hรคmtningen fรคrdig i \"endast-hรคmta\"-lรคge"
 
@@ -731,7 +739,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Fรถljande information kan vara till hjรคlp fรถr att lรถsa situationen:"
 
@@ -783,7 +791,7 @@ msgstr ""
 "Otillfredsstรคllda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lรถsning)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -795,80 +803,78 @@ msgstr ""
 "att nรฅgra nรถdvรคndiga paket รคnnu inte har skapats eller flyttats\n"
 "ut frรฅn \"Incoming\"."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Fรถljande ytterligare paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Fรถreslagna paket:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s รคr satt till automatiskt installerad.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Detta kommando รคr fรถrรฅldrat. Anvรคnd \"apt-mark auto\" och \"apt-mark manual"
-"\" istรคllet."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Berรคknar uppgradering... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Fรคrdig"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlรถsaren fรถrstรถrde nรฅgonting"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte lรฅsa hรคmtningskatalogen"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "Hรคmtar %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du mรฅste ange minst ett paket att hรคmta kรคllkod fรถr"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta nรฅgot kรคllkodspaket fรถr %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -878,7 +884,7 @@ msgstr ""
 "pรฅ:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -889,87 +895,85 @@ msgstr ""
 "bzr get %s\n"
 "fรถr att hรคmta senaste (mรถjligen inte utgivna) uppdateringar av paketet.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar รถver redan hรคmtade filen \"%s\"\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har inte tillrรคckligt mycket ledigt utrymme i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Behรถver hรคmta %sB/%sB kรคllkodsarkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behรถver hรคmta %sB kรคllkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hรคmtar kรคllkoden %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hรคmta vissa arkiv."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Packar inte upp redan uppackad kรคllkod i %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Fรถrsรคkra dig om att paketet \"dpkg-dev\" รคr installerat.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du mรฅste ange minst ett paket att kontrollera byggberoenden fรถr"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"Ingen arkitekturinformation tillgรคnglig fรถr %s. Se apt.conf(5) APT::"
-"Architectures fรถr instรคllning"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunde inte hรคmta information om byggberoenden fรถr %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -978,7 +982,7 @@ msgstr ""
 "%s-beroendet pรฅ %s kan inte tillfredsstรคllas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -987,14 +991,14 @@ msgstr ""
 "%s-beroendet pรฅ %s kan inte tillfredsstรคllas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Misslyckades med att tillfredsstรคlla %s-beroendet fรถr %s: Det installerade "
 "paketet %s รคr fรถr nytt"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1003,7 +1007,7 @@ msgstr ""
 "%s-beroendet pรฅ %s kan inte tillfredsstรคllas eftersom inga tillgรคngliga "
 "versioner av paketet %s tillfredsstรคller versionskraven"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1012,31 +1016,31 @@ msgstr ""
 "%s-beroendet pรฅ %s kan inte tillfredsstรคllas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Misslyckades med att tillfredsstรคlla %s-beroendet fรถr %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden fรถr %s kunde inte tillfredsstรคllas."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
 # Felmeddelande fรถr misslyckad chdir
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Moduler som stรถds:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1124,7 +1128,7 @@ msgstr ""
 "fรถr mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1204,7 +1208,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s รคr redan den senaste versionen.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Vรคntade pรฅ %s men den fanns inte dรคr"
@@ -1221,7 +1226,7 @@ msgstr "Misslyckades med att รถppna %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Kรถrning av dpkg misslyckades. ร„r du root?"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1342,8 +1347,8 @@ msgstr "Tidsgrรคnsen fรถr anslutningen รถverskreds"
 msgid "Server closed the connection"
 msgstr "Servern stรคngde anslutningen"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lรคsfel"
 
@@ -1356,8 +1361,8 @@ msgid "Protocol corruption"
 msgstr "Protokollet skadat"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Skrivfel"
 
@@ -1411,7 +1416,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgrรคnsen"
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problem med att lรคgga filen till hashtabellen"
 
@@ -1440,90 +1445,104 @@ msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
 # Felmeddelande fรถr misslyckad chdir
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 # [f]amilj, [t]yp, [p]rotokoll
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kunde inte skapa ett uttag (socket) fรถr %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kunde inte initiera anslutningen till %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen รถverskred tidsgrรคns"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunde inte ansluta till %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunde inte slรฅ upp \"%s\""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporรคrt fel vid uppslagning av \"%s\""
 
 # Okรคnd felkod; %i = koden
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Nรฅgot konstigt hรคnde nรคr \"%s:%s\" slogs upp (%i - %s)"
+
+# Okรคnd felkod; %i = koden
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Nรฅgot konstigt hรคnde nรคr \"%s:%s\" slogs upp (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunde inte ansluta till %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internt fel: Korrekt signatur men kunde inte faststรคlla nyckelns "
 "fingeravtryck?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur trรคffades pรฅ."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunde inte kรถra \"gpgv\" fรถr att verifiera signatur (รคr gpgv installerad?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Okรคnt fel vid kรถrning av gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Fรถljande signaturer รคr ogiltiga:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1533,7 +1552,7 @@ msgstr ""
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "Tomma filer kan inte vara giltiga arkiv"
+msgstr ""
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1563,53 +1582,53 @@ msgstr "Den hรคr http-serverns stรถd fรถr delvis hรคmtning fungerar inte"
 msgid "Unknown date format"
 msgstr "Okรคnt datumformat"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Anslutningen รถverskred tidsgrรคnsen"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fel vid lรคsning frรฅn server: Andra รคnden stรคngde fรถrbindelsen"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Fel vid lรคsning frรฅn server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Internt fel"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunde inte lรคsa %s"
@@ -1637,7 +1656,12 @@ msgstr "Ingen spegelfil \"%s\" hittades "
 msgid "Can not read mirror file '%s'"
 msgstr "Ingen spegelfil \"%s\" hittades "
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Ingen spegelfil \"%s\" hittades "
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spegel: %s]"
@@ -1735,7 +1759,7 @@ msgstr ""
 "  -c=? Lรคs denna konfigurationsfil.\n"
 "  -o=? Stรคll in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunde inte skriva till %s"
@@ -1881,8 +1905,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Kunde inte รถppna DB-filen %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Misslyckades med att ta status pรฅ %s"
@@ -1895,90 +1919,90 @@ msgstr "Arkivet har ingen styrpost"
 msgid "Unable to get a cursor"
 msgstr "Kunde inte fรฅ tag i nรฅgon markรถr"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "V: Kunde inte lรคsa katalogen %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "V: Kunde inte ta status pรฅ %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "V: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "F: Felen gรคller filen "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Misslyckades med att slรฅ upp %s"
 
 # ???
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Trรคdvandring misslyckades"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Misslyckades med att รถppna %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Avlรคnka %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Misslyckades med att lรคsa lรคnken %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Misslyckades med att lรคnka ut %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Misslyckades med att lรคnka %s till %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Avlรคnkningsgrรคnsen pรฅ %sB nรฅddes.\n"
 
 # Fรคlt vid namn "Package"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Arkivet har inget package-fรคlt"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen post i override-filen\n"
 
 # parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ansvarig fรถr paketet %s รคr %s ej %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen kรคllรฅsidosรคttningspost\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har heller ingen binรคr รฅsidosรคttningspost\n"
@@ -2054,7 +2078,7 @@ msgstr "Misslyckades med att lรคsa vid berรคkning av MD5"
 msgid "Problem unlinking %s"
 msgstr "Problem med att lรคnka ut %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Misslyckades med att byta namn pรฅ %s till %s"
@@ -2112,23 +2136,23 @@ msgstr ""
 "  -c=? Lรคs denna konfigurationsfil.\n"
 "  -o=? Stรคll in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Misslyckades med att skapa rรถr"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Misslyckades med att kรถra gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Skadat arkiv"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Okรคnd TAR-rubriktyp %u, del %s"
@@ -2199,54 +2223,54 @@ msgstr "Misslyckades med att skriva filen %s"
 msgid "Failed to close file %s"
 msgstr "Misslyckades med att stรคnga filen %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Sรถkvรคgen %s รคr fรถr lรฅng"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Packar upp %s flera gรฅnger"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s รคr omdirigerad"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketet fรถrsรถker att skriva till omdirigeringsmรฅlet %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Omdirigeringssรถkvรคgen รคr fรถr lรฅng"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Katalogen %s ersรคtts av en icke-katalog"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Misslyckades med att hitta noden i sin hashkorg"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Sรถkvรคgen รคr fรถr lรฅng"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriv รถver pakettrรคff utan version fรถr %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Filen %s/%s skriver รถver den i paketet %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kunde inte ta status pรฅ %s"
@@ -2328,30 +2352,30 @@ msgstr ""
 "av anvรคndaren."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"
@@ -2421,6 +2445,16 @@ msgstr "%c%s... Fel!"
 msgid "%c%s... Done"
 msgstr "%c%s... Fรคrdig"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Fรคrdig"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2482,116 +2516,120 @@ msgstr "Kunde inte ta status pรฅ cd-romen."
 msgid "Problem closing the gzip file %s"
 msgstr "Problem med att stรคnga gzip-filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Anvรคnder inte lรฅsning fรถr skrivskyddade lรฅsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunde inte รถppna lรฅsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Anvรคnder inte lรฅsning fรถr nfs-monterade lรฅsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunde inte erhรฅlla lรฅset %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr "Lista รถver filer kan inte skapas eftersom \"%s\" inte รคr en katalog"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Ignorerar \"%s\" i katalogen \"%s\" eftersom det inte รคr en vanlig fil"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
-"Ignorerar \"%s\" i katalogen \"%s\" eftersom den inte har nรฅgon filรคndelse"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
-"Ignorerar \"%s\" i katalogen \"%s\" eftersom den har en ogiltig filรคndelse"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s rรฅkade ut fรถr ett segmenteringsfel."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s tog emot signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s svarade med en felkod (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s avslutades ovรคntat"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunde inte รถppna filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kunde inte รถppna filhandtag %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Misslyckades med att skapa underprocess-IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Misslyckades med att starta komprimerare "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lรคsning, har fortfarande %lu att lรคsa men ingenting finns kvar"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem med att stรคnga filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem med att byta namn pรฅ filen %s till %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem med att avlรคnka filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problem med att synkronisera filen"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nyckelring installerad i %s."
+
 # Felmeddelande
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
@@ -2619,61 +2657,61 @@ msgstr "Denna APT saknar stรถd fรถr versionssystemet \"%s\""
 msgid "The package cache was built for a different architecture"
 msgstr "Paketcachen byggdes fรถr en annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Beroende av"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Fรถrberoende av"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Fรถreslรฅr"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Rekommenderar"
 
 # "Konfliktar"?
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Stรฅr i konflikt med"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Ersรคtter"
 
 # "Fรถrรฅldrar"?
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Fรถrรฅldrar"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Gรถr sรถnder"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Utรถkar"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "viktigt"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "nรถdvรคndigt"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2773,17 +2811,17 @@ msgstr "ร–ppnar %s"
 msgid "Line %u too long in source list %s."
 msgstr "Rad %u รคr fรถr lรฅng i kรคllistan %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Rad %u i kรคllistan %s har fel format (typ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ \"%s\" รคr inte kรคnd pรฅ rad %u i listan รถver kรคllor %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2792,12 +2830,12 @@ msgstr ""
 "Kunde inte genomfรถra omedelbar konfiguration pรฅ \"%s\". Se man 5 apt.conf "
 "under APT::Immediate-Configure fรถr information. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Kunde inte รถppna filen \"%s\""
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2821,7 +2859,7 @@ msgid ""
 msgstr ""
 "Paketet %s mรฅste installeras om, men jag kan inte hitta nรฅgot arkiv fรถr det."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2829,11 +2867,11 @@ msgstr ""
 "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero pรฅ "
 "tillbakahรฅllna paket."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hรฅllit tillbaka trasiga paket."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2842,7 +2880,7 @@ msgstr ""
 "Vissa indexfiler kunde inte hรคmtas, de har ignorerats eller sรฅ har de gamla "
 "anvรคnts istรคllet."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listkatalogen %spartial saknas."
@@ -2879,19 +2917,19 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck pรฅ Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketsystemet \"%s\" stรถds inte"
 
 #
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunde inte faststรคlla en lรคmplig paketsystemstyp"
 
@@ -2922,8 +2960,6 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
-"Vรคrdet \"%s\" รคr ogiltigt fรถr APT::Default-Release eftersom en sรฅdan utgรฅva "
-"inte finns tillgรคnglig i kรคllorna"
 
 # "Package" รคr en strรคng i konfigurationsfilen
 #: apt-pkg/policy.cc:399
@@ -2948,14 +2984,14 @@ msgstr "Cachen har ett inkompatibelt versionssystem"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Fel uppstod vid hantering av %s (FindPkg)"
@@ -2976,27 +3012,27 @@ msgstr "Grattis, du รถverskred antalet beskrivningar som denna APT kan hantera."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Grattis, du รถverskred antalet beroenden som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Paketet %s %s hittades inte nรคr filberoenden hanterades"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunde inte ta status pรฅ kรคllkodspaketlistan %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Lรคser paketlistor"
 
 # Bรคttre ord?
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Samlar filtillhandahรฅllningar"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "In-/utfel vid lagring av kรคllcache"
 
@@ -3009,47 +3045,43 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5-kontrollsumman stรคmmer inte"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash-kontrollsumman stรคmmer inte"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
-"Kunde inte hitta fรถrvรคntad post \"%s\" i Release-filen (Felaktig post i "
-"sources.list eller felformulerad fil)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kunde inte tolka \"Release\"-filen %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Det finns ingen รถppen nyckel tillgรคnglig fรถr fรถljande nyckel-id:n:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"Release-filen fรถr %s har gรฅtt ut (ogiltig sedan %s). Uppdateringar fรถr det "
-"hรคr fรถrrรฅdet kommer inte tillรคmpas."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt i distribution: %s (fรถrvรคntade %s men fick %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Ett fel intrรคffade vid verifiering av signaturen. Fรถrrรฅdet har inte "
@@ -3057,12 +3089,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3071,7 +3103,7 @@ msgstr ""
 "Jag kunde inte hitta nรฅgon fil fรถr paketet %s. Detta kan betyda att du "
 "manuellt mรฅste reparera detta paket (pรฅ grund av saknad arkitektur)."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3080,37 +3112,37 @@ msgstr ""
 "Jag kunde inte hitta nรฅgon fil fรถr paketet %s. Detta kan betyda att du "
 "manuellt mรฅste reparera detta paket."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paketindexfilerna รคr skadede. Inget \"Filename:\"-fรคlt fรถr paketet %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Storleken stรคmmer inte"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kunde inte tolka \"Release\"-filen %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Inga sektioner i Release-filen %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ingen Hash-post i Release-filen %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ogiltig \"Date\"-post i Release-filen %s"
@@ -3138,7 +3170,7 @@ msgstr "Identifierar.. "
 msgid "Stored label: %s\n"
 msgstr "Lagrad etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "Avmonterar cd-rom...\n"
 
@@ -3202,30 +3234,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kopierar paketlistor..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Skriver ny kรคllista\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i kรคllistan fรถr denna skiva:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i saknade filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i filer som inte stรคmmer\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stรคmmer\n"
@@ -3240,17 +3272,6 @@ msgstr "Kan inte hitta autentiseringspost fรถr: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-kontrollsumman stรคmmer inte fรถr: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Filen %s bรถrjar inte med ett klarsignerat meddelande"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3309,128 +3330,128 @@ msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr "Skicka scenario till lรถsare"
+msgstr ""
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr "Skicka begรคran till lรถsare"
+msgstr ""
 
 #: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
-msgstr "Fรถrbered fรถr mottagning av lรถsning"
+msgstr ""
 
 #: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
-msgstr "Extern lรถsare misslyckades utan ett riktigt felmeddelande"
+msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
-msgstr "Kรถr extern lรถsare"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "Tar bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Uppmรคrksammar fรถrsvinnandet av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kรถr efterinstallationsutlรถsare %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunde inte รถppna filen \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Fรถrbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Fรถrbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Fรถrbereder borttagning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Fรถrbereder borttagning av hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "Kรถr dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
-msgstr "ร…tgรคrden avbrรถts innan den kunde fรคrdigstรคllas"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ingen apport-rapport skrevs dรคrfรถr att MaxReports redan har uppnรฅtts"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "beroendeproblem - lรคmnar okonfigurerad"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3438,7 +3459,7 @@ msgstr ""
 "Ingen apport-rapport skrevs dรคrfรถr att felmeddelandet indikerar att det รคr "
 "ett efterfรถljande fel frรฅn ett tidigare problem."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3454,15 +3475,7 @@ msgstr ""
 "Ingen apport-rapport skrevs dรคrfรถr att felmeddelandet indikerar att minnet "
 "รคr slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apport-rapport skrevs eftersom felmeddelandet antyder ett problem i "
-"det lokala systemet"
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3495,23 +3508,6 @@ msgstr ""
 msgid "Not locked"
 msgstr "Inte lรฅst"
 
-# Okรคnd felkod; %i = koden
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Nรฅgot konstigt hรคnde nรคr \"%s:%s\" slogs upp (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Fรคrdig"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Ett fel intrรคffade vid verifiering av signaturen. Fรถrrรฅdet har inte "
-#~ "uppdaterats och de tidigare indexfilerna kommer att anvรคndas. GPG-fel: "
-#~ "%s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Hoppar รถver icke-existerande filen %s"
 
diff --git a/po/th.po b/po/th.po
index 1d3ccc886..c5c480595 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-10-27 22:44+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -96,72 +96,72 @@ msgstr "เธžเธทเน‰เธ™เธ—เธตเนˆเธ—เธตเนˆเธ™เธฑเธšเธฃเธงเธกเธ—เธฑเน‰เธ‡เธซเธกเธ”: "
 msgid "Package file %s is out of sync."
 msgstr "เธ‚เน‰เธญเธกเธนเธฅเนเธŸเน‰เธก Package %s เน„เธกเนˆเธ•เธฃเธ‡เธเธฑเธšเธ„เธงเธฒเธกเน€เธ›เน‡เธ™เธˆเธฃเธดเธ‡"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "เน„เธกเนˆเธžเธšเนเธžเธเน€เธเธˆ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "เธ„เธธเธ“เธ•เน‰เธญเธ‡เธฃเธฐเธšเธธเนเธžเธ•เน€เธ—เธดเธฃเนŒเธ™เธชเธณเธซเธฃเธฑเธšเธ„เน‰เธ™เธซเธฒเธญเธขเนˆเธฒเธ‡เธ™เน‰เธญเธขเธซเธ™เธถเนˆเธ‡เนเธžเธ•เน€เธ—เธดเธฃเนŒเธ™"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "เธ„เธณเธชเธฑเนˆเธ‡เธ™เธตเน‰เน„เธกเนˆเนเธ™เธฐเธ™เธณเนƒเธซเน‰เนƒเธŠเน‰เนเธฅเน‰เธง เธเธฃเธธเธ“เธฒเนƒเธŠเน‰ 'apt-mark showauto' เนเธ—เธ™"
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "เน„เธกเนˆเธžเธšเนเธžเธเน€เธเธˆ %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "เนเธŸเน‰เธกเนเธžเธเน€เธเธˆ:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "เธ‚เน‰เธญเธกเธนเธฅเนเธ„เธŠเน„เธกเนˆเธ•เธฃเธ‡เธเธฑเธšเธ„เธงเธฒเธกเน€เธ›เน‡เธ™เธˆเธฃเธดเธ‡เนเธฅเน‰เธง เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธญเน‰เธฒเธ‡เธญเธดเธ‡เน„เธ‚เธงเน‰เธฃเธฐเธซเธงเนˆเธฒเธ‡เนเธŸเน‰เธกเนเธžเธเน€เธเธˆ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "เนเธžเธเน€เธเธˆเธ—เธตเนˆเธ–เธนเธเธ•เธฃเธถเธ‡:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(เน„เธกเนˆเธžเธš)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  เธ—เธตเนˆเธ•เธดเธ”เธ•เธฑเน‰เธ‡เธญเธขเธนเนˆ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  เธฃเธธเนˆเธ™เธ—เธตเนˆเธ•เธดเธ”เธ•เธฑเน‰เธ‡เน„เธ”เน‰: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(เน„เธกเนˆเธกเธต)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  เธเธฒเธฃเธ•เธฃเธถเธ‡เนเธžเธเน€เธเธˆ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  เธ•เธฒเธฃเธฒเธ‡เธฃเธธเนˆเธ™:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s เธชเธณเธซเธฃเธฑเธš %s เธ„เธญเธกเน„เธžเธฅเนŒเน€เธกเธทเนˆเธญ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -231,20 +231,28 @@ msgstr ""
 "  -o=? เธเธณเธซเธ™เธ”เธ•เธฑเธงเน€เธฅเธทเธญเธเธ„เนˆเธฒเธ•เธฑเน‰เธ‡เน€เธ›เน‡เธ™เธฃเธฒเธขเธ•เธฑเธง เน€เธŠเนˆเธ™ -o dir::cache=/tmp\n"
 "เธเธฃเธธเธ“เธฒเธญเนˆเธฒเธ™เธ‚เน‰เธญเธกเธนเธฅเน€เธžเธดเนˆเธกเน€เธ•เธดเธกเธˆเธฒเธ manual page apt-cache(8) เนเธฅเธฐ apt.conf(5)\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "เธเธฃเธธเธ“เธฒเธ•เธฑเน‰เธ‡เธŠเธทเนˆเธญเนเธœเนˆเธ™ เน€เธŠเนˆเธ™ 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "เธเธฃเธธเธ“เธฒเนƒเธชเนˆเนเธœเนˆเธ™เธฅเธ‡เนƒเธ™เน„เธ”เธฃเธงเนŒเนเธฅเน‰เธงเธเธ” enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธกเธฒเธ™เธ—เนŒ '%s' เธ—เธตเนˆ '%s'"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "เธ—เธณเน€เธŠเนˆเธ™เธ™เธตเน‰เธ•เนˆเธญเน„เธ›เธเธฑเธšเนเธœเนˆเธ™เธ‹เธตเธ”เธตเธ—เธตเนˆเน€เธซเธฅเธทเธญเนƒเธ™เธŠเธธเธ”"
 
@@ -476,7 +484,7 @@ msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡ %s เธ‹เน‰เธณเน„เธ”เน‰ เ
 msgid "%s is already the newest version.\n"
 msgstr "%s เน€เธ›เน‡เธ™เธฃเธธเนˆเธ™เนƒเธซเธกเนˆเธฅเนˆเธฒเธชเธธเธ”เธญเธขเธนเนˆเนเธฅเน‰เธง\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "เธเธณเธซเธ™เธ” %s เนƒเธซเน‰เน€เธ›เน‡เธ™เธเธฒเธฃเธ•เธดเธ”เธ•เธฑเน‰เธ‡เนเธšเธšเน€เธฅเธทเธญเธเน€เธญเธ‡เนเธฅเน‰เธง\n"
@@ -583,8 +591,8 @@ msgstr "เธซเธฅเธฑเธ‡เธˆเธฒเธเธเธฒเธฃเธเธฃเธฐเธ—เธณเธ™เธตเน‰ เธ•เน‰เธญเธ‡เนƒเธ
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "เธซเธฅเธฑเธ‡เธˆเธฒเธเธเธฒเธฃเธเธฃเธฐเธ—เธณเธ™เธตเน‰ เน€เธ™เธทเน‰เธญเธ—เธตเนˆเธšเธ™เธ”เธดเธชเธเนŒเธˆเธฐเธงเนˆเธฒเธ‡เน€เธžเธดเนˆเธกเธญเธตเธ %sB\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ„เธณเธ™เธงเธ“เธžเธทเน‰เธ™เธ—เธตเนˆเธงเนˆเธฒเธ‡เนƒเธ™ %s"
@@ -623,7 +631,7 @@ msgstr "เน€เธฅเธดเธเธ—เธณ"
 msgid "Do you want to continue [Y/n]? "
 msgstr "เธ„เธธเธ“เธ•เน‰เธญเธ‡เธเธฒเธฃเธˆเธฐเธ”เธณเน€เธ™เธดเธ™เธเธฒเธฃเธ•เนˆเธญเน„เธ›เธซเธฃเธทเธญเน„เธกเนˆ [Y/n]?"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ” %s  %s\n"
@@ -632,7 +640,7 @@ msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ” %s  %s\n"
 msgid "Some files failed to download"
 msgstr "เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธšเธฒเธ‡เนเธŸเน‰เธกเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธชเธณเน€เธฃเน‡เธˆเนเธฅเน‰เธง เนเธฅเธฐเธญเธขเธนเนˆเนƒเธ™เน‚เธซเธกเธ”เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธญเธขเนˆเธฒเธ‡เน€เธ”เธตเธขเธง"
 
@@ -713,7 +721,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "เธ‚เน‰เธญเธกเธนเธฅเธ•เนˆเธญเน„เธ›เธ™เธตเน‰เธญเธฒเธˆเธŠเนˆเธงเธขเนเธเน‰เธ›เธฑเธเธซเธฒเน„เธ”เน‰:"
 
@@ -757,7 +765,7 @@ msgstr ""
 "เธกเธตเธ›เธฑเธเธซเธฒเธ„เธงเธฒเธกเธ‚เธถเน‰เธ™เธ•เนˆเธญเธเธฑเธ™เธฃเธฐเธซเธงเนˆเธฒเธ‡เนเธžเธเน€เธเธˆ เธเธฃเธธเธ“เธฒเธฅเธญเธ‡เนƒเธŠเน‰ 'apt-get -f install' เน‚เธ”เธขเน„เธกเนˆเธฃเธฐเธšเธธเนเธžเธเน€เธเธˆ "
 "(เธซเธฃเธทเธญเธˆเธฐเธฃเธฐเธšเธธเธ—เธฒเธ‡เนเธเน‰เธเน‡เน„เธ”เน‰)"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -768,78 +776,78 @@ msgstr ""
 "เธซเธฃเธทเธญเธ–เน‰เธฒเธ„เธธเธ“เธเธณเธฅเธฑเธ‡เนƒเธŠเน‰เธฃเธธเนˆเธ™ unstable เธเน‡เน€เธ›เน‡เธ™เน„เธ›เน„เธ”เน‰เธงเนˆเธฒเนเธžเธเน€เธเธˆเธ—เธตเนˆเธˆเธณเน€เธ›เน‡เธ™เธšเธฒเธ‡เธฃเธฒเธขเธเธฒเธฃ\n"
 "เธขเธฑเธ‡เน„เธกเนˆเธ–เธนเธเธชเธฃเน‰เธฒเธ‡เธ‚เธถเน‰เธ™ เธซเธฃเธทเธญเธ–เธนเธเธขเน‰เธฒเธขเธญเธญเธเธˆเธฒเธ Incoming"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "เนเธžเธเน€เธเธˆเธกเธตเธ›เธฑเธเธซเธฒ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "เธˆเธฐเธ•เธดเธ”เธ•เธฑเน‰เธ‡เนเธžเธเน€เธเธˆเน€เธžเธดเนˆเธกเน€เธ•เธดเธกเธ•เนˆเธญเน„เธ›เธ™เธตเน‰:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "เนเธžเธเน€เธเธˆเธ—เธตเนˆเนเธ™เธฐเธ™เธณ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "เนเธžเธเน€เธเธˆเธ—เธตเนˆเธ„เธงเธฃเนƒเธŠเน‰เธฃเนˆเธงเธกเธเธฑเธ™:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "เน„เธกเนˆเธžเธšเนเธžเธเน€เธเธˆ %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "เธเธณเธซเธ™เธ” %s เนƒเธซเน‰เน€เธ›เน‡เธ™เธเธฒเธฃเธ•เธดเธ”เธ•เธฑเน‰เธ‡เนเธšเธšเธญเธฑเธ•เน‚เธ™เธกเธฑเธ•เธดเนเธฅเน‰เธง\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr "เธ„เธณเธชเธฑเนˆเธ‡เธ™เธตเน‰เน„เธกเนˆเนเธ™เธฐเธ™เธณเนƒเธซเน‰เนƒเธŠเน‰เนเธฅเน‰เธง เธเธฃเธธเธ“เธฒเนƒเธŠเน‰ 'apt-mark auto' เนเธฅเธฐ 'apt-mark manual' เนเธ—เธ™"
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "เธเธณเธฅเธฑเธ‡เธ„เธณเธ™เธงเธ“เธเธฒเธฃเธ›เธฃเธฑเธšเธฃเธธเนˆเธ™... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "เธฅเน‰เธกเน€เธซเธฅเธง"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "เน€เธชเธฃเน‡เธˆเนเธฅเน‰เธง"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ เธฒเธขเนƒเธ™: เธเธฅเน„เธเธเธฒเธฃเนเธเน‰เธ›เธฑเธเธซเธฒเธ—เธณเธ„เธงเธฒเธกเน€เธชเธตเธขเธซเธฒเธข"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธฅเน‡เธญเธ„เน„เธ”เน€เธฃเธเธ—เธญเธฃเธตเธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "เน„เธกเนˆเธžเธšเนเธซเธฅเนˆเธ‡เธ—เธตเนˆเธˆเธฐเธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธฃเธธเนˆเธ™ '%s' เธ‚เธญเธ‡ '%s' เน„เธ”เน‰"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "เธเธณเธฅเธฑเธ‡เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ” %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "เธ•เน‰เธญเธ‡เธฃเธฐเธšเธธเนเธžเธเน€เธเธˆเธญเธขเนˆเธฒเธ‡เธ™เน‰เธญเธขเธซเธ™เธถเนˆเธ‡เนเธžเธเน€เธเธˆเธ—เธตเนˆเธˆเธฐเธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธ‹เธญเธฃเนŒเธชเน‚เธ„เน‰เธ”"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "เน„เธกเนˆเธžเธšเนเธžเธเน€เธเธˆเธ‹เธญเธฃเนŒเธชเน‚เธ„เน‰เธ”เธชเธณเธซเธฃเธฑเธš %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -848,7 +856,7 @@ msgstr ""
 "เธ‚เน‰เธญเธชเธฑเธ‡เน€เธเธ•: เธเธฒเธฃเธˆเธฑเธ”เธ—เธณเนเธžเธเน€เธเธˆ '%s' เธžเธฑเธ’เธ™เธฒเธœเนˆเธฒเธ™เธฃเธฐเธšเธšเธ„เธงเธšเธ„เธธเธกเธฃเธธเนˆเธ™ '%s' เธญเธขเธนเนˆเธ—เธตเนˆ:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -859,68 +867,68 @@ msgstr ""
 "bzr branch %s\n"
 "เน€เธžเธทเนˆเธญเธ”เธถเธ‡เธฃเธธเนˆเธ™เธฅเนˆเธฒเธชเธธเธ” (เธ—เธตเนˆเธญเธฒเธˆเธขเธฑเธ‡เน„เธกเนˆเธ›เธฅเนˆเธญเธขเธญเธญเธเธกเธฒ) เธ‚เธญเธ‡เธ•เธฑเธงเนเธžเธเน€เธเธˆ\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "เธˆเธฐเธ‚เน‰เธฒเธกเนเธŸเน‰เธก '%s' เธ—เธตเนˆเธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เน„เธงเน‰เนเธฅเน‰เธง\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "เธ„เธธเธ“เธกเธตเธžเธทเน‰เธ™เธ—เธตเนˆเธงเนˆเธฒเธ‡เน€เธซเธฅเธทเธญเน„เธกเนˆเธžเธญเนƒเธ™ %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "เธ•เน‰เธญเธ‡เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธ‹เธญเธฃเนŒเธชเน‚เธ„เน‰เธ” %sB/%sB\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "เธ•เน‰เธญเธ‡เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธ‹เธญเธฃเนŒเธชเน‚เธ„เน‰เธ” %sB\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธ‹เธญเธฃเนŒเธช %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เธšเธฒเธ‡เนเธŸเน‰เธก"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "เธˆเธฐเธ‚เน‰เธฒเธกเธเธฒเธฃเนเธ•เธเธ‹เธญเธฃเนŒเธชเธ‚เธญเธ‡เธ‹เธญเธฃเนŒเธชเธ—เธตเนˆเนเธ•เธเน„เธงเน‰เนเธฅเน‰เธงเนƒเธ™ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "เธ„เธณเธชเธฑเนˆเธ‡เนเธ•เธเนเธŸเน‰เธก '%s' เธฅเน‰เธกเน€เธซเธฅเธง\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "เธเธฃเธธเธ“เธฒเธ•เธฃเธงเธˆเธชเธญเธšเธงเนˆเธฒเน„เธ”เน‰เธ•เธดเธ”เธ•เธฑเน‰เธ‡เนเธžเธเน€เธเธˆ 'dpkg-dev' เนเธฅเน‰เธง\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "เธ„เธณเธชเธฑเนˆเธ‡ build '%s' เธฅเน‰เธกเน€เธซเธฅเธง\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "เน‚เธžเธฃเน€เธ‹เธชเธฅเธนเธเธฅเน‰เธกเน€เธซเธฅเธง"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "เธ•เน‰เธญเธ‡เธฃเธฐเธšเธธเนเธžเธเน€เธเธˆเธญเธขเนˆเธฒเธ‡เธ™เน‰เธญเธขเธซเธ™เธถเนˆเธ‡เนเธžเธเน€เธเธˆเธ—เธตเนˆเธˆเธฐเธ•เธฃเธงเธˆเธชเธญเธšเธชเธดเนˆเธ‡เธ—เธตเนˆเธ•เน‰เธญเธ‡เธเธฒเธฃเธชเธณเธซเธฃเธฑเธšเธเธฒเธฃ build"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -928,17 +936,17 @@ msgid ""
 msgstr ""
 "เน„เธกเนˆเธกเธตเธ‚เน‰เธญเธกเธนเธฅเธชเธ–เธฒเธ›เธฑเธ•เธขเธเธฃเธฃเธกเธชเธณเธซเธฃเธฑเธš %s เธ”เธนเธงเธดเธ˜เธตเธ•เธฑเน‰เธ‡เธ„เนˆเธฒเธ—เธตเนˆเธซเธฑเธงเธ‚เน‰เธญ APT::Architectures เธ‚เธญเธ‡ apt.conf(5)"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธญเนˆเธฒเธ™เธ‚เน‰เธญเธกเธนเธฅเธชเธดเนˆเธ‡เธ—เธตเนˆเธ•เน‰เธญเธ‡เธเธฒเธฃเธชเธณเธซเธฃเธฑเธšเธเธฒเธฃ build เธ‚เธญเธ‡ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s เน„เธกเนˆเธ•เน‰เธญเธ‡เธเธฒเธฃเธชเธดเนˆเธ‡เนƒเธ”เธชเธณเธซเธฃเธฑเธš build\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -946,19 +954,19 @@ msgid ""
 msgstr ""
 "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เน€เธŠเธทเนˆเธญเธกเน‚เธขเธ‡ %s เธชเธณเธซเธฃเธฑเธš %s เน„เธ”เน‰ เน€เธžเธฃเธฒเธฐเน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เนƒเธŠเน‰ %s เธเธฑเธšเนเธžเธเน€เธเธˆ '%s' เน„เธ”เน‰"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เน€เธŠเธทเนˆเธญเธกเน‚เธขเธ‡ %s เธชเธณเธซเธฃเธฑเธš %s เน„เธ”เน‰ เน€เธžเธฃเธฒเธฐเน„เธกเนˆเธžเธšเนเธžเธเน€เธเธˆ %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เน€เธŠเธทเนˆเธญเธกเน‚เธขเธ‡ %s เธชเธณเธซเธฃเธฑเธš %s เน„เธ”เน‰: เนเธžเธเน€เธเธˆ %s เธ—เธตเนˆเธ•เธดเธ”เธ•เธฑเน‰เธ‡เน„เธงเน‰เนƒเธซเธกเนˆเน€เธเธดเธ™เน„เธ›"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -967,37 +975,37 @@ msgstr ""
 "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เน€เธŠเธทเนˆเธญเธกเน‚เธขเธ‡ %s เธชเธณเธซเธฃเธฑเธš %s เน„เธ”เน‰ เน€เธžเธฃเธฒเธฐเน„เธกเนˆเธกเธตเนเธžเธเน€เธเธˆ %s "
 "เธฃเธธเนˆเธ™เธ—เธตเนˆเธˆเธฐเธชเธญเธ”เธ„เธฅเน‰เธญเธ‡เธเธฑเธšเธ„เธงเธฒเธกเธ•เน‰เธญเธ‡เธเธฒเธฃเธฃเธธเนˆเธ™เธ‚เธญเธ‡เนเธžเธเน€เธเธˆเน„เธ”เน‰"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เน€เธŠเธทเนˆเธญเธกเน‚เธขเธ‡ %s เธชเธณเธซเธฃเธฑเธš %s เน„เธ”เน‰ เน€เธžเธฃเธฒเธฐ %s เน„เธกเนˆเธกเธตเธฃเธธเนˆเธ™เธ—เธตเนˆเธ•เธดเธ”เธ•เธฑเน‰เธ‡เน„เธ”เน‰"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เน€เธŠเธทเนˆเธญเธกเน‚เธขเธ‡ %s เธชเธณเธซเธฃเธฑเธš %s เน„เธ”เน‰: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เธ—เธตเนˆเธˆเธณเน€เธ›เน‡เธ™เธชเธณเธซเธฃเธฑเธšเธเธฒเธฃ build เธ‚เธญเธ‡ %s เน„เธ”เน‰"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "เธ•เธดเธ”เธ•เธฑเน‰เธ‡เธชเธดเนˆเธ‡เธ—เธตเนˆเธˆเธณเน€เธ›เน‡เธ™เธชเธณเธซเธฃเธฑเธšเธเธฒเธฃ build เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "เธ›เธนเธกเธเธฒเธฃเนเธเน‰เน„เธ‚เธชเธณเธซเธฃเธฑเธš %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "เธกเธญเธ”เธนเธฅเธ—เธตเนˆเธฃเธญเธ‡เธฃเธฑเธš:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1084,7 +1092,7 @@ msgstr ""
 "เนเธฅเธฐ apt.conf(5)\n"
 "                       APT เธ™เธตเน‰เธกเธตเธžเธฅเธฑเธ‡เธ‚เธญเธ‡ Super Cow\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1159,7 +1167,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s เน„เธกเนˆเน„เธ”เน‰เธ„เธ‡เธฃเธธเนˆเธ™เธญเธขเธนเนˆเธเนˆเธญเธ™เนเธฅเน‰เธง\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "เธฃเธญเน‚เธžเธฃเน€เธ‹เธช %s เนเธ•เนˆเธ•เธฑเธงเน‚เธžเธฃเน€เธ‹เธชเน„เธกเนˆเธญเธขเธนเนˆ"
@@ -1311,8 +1320,8 @@ msgstr "เธซเธกเธ”เน€เธงเธฅเธฒเธฃเธญเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญ"
 msgid "Server closed the connection"
 msgstr "เน€เธ‹เธดเธฃเนŒเธŸเน€เธงเธญเธฃเนŒเธ›เธดเธ”เธเธฒเธฃเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "เธเธฒเธฃเธญเนˆเธฒเธ™เธ‚เน‰เธญเธกเธนเธฅเธœเธดเธ”เธžเธฅเธฒเธ”"
 
@@ -1325,8 +1334,8 @@ msgid "Protocol corruption"
 msgstr "เธกเธตเธ„เธงเธฒเธกเน€เธชเธตเธขเธซเธฒเธขเธ‚เธญเธ‡เน‚เธžเธฃเน‚เธ—เธ„เธญเธฅ"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "เธเธฒเธฃเน€เธ‚เธตเธขเธ™เธ‚เน‰เธญเธกเธนเธฅเธœเธดเธ”เธžเธฅเธฒเธ”"
 
@@ -1380,7 +1389,7 @@ msgstr "เธซเธกเธ”เน€เธงเธฅเธฒเธฃเธญเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเธ‹เน‡เธญเธเน€เธ
 msgid "Unable to accept connection"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธฃเธฑเธšเธเธฒเธฃเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธ‚เธ“เธฐเธ„เธณเธ™เธงเธ“เธ„เนˆเธฒเนเธฎเธŠเธ‚เธญเธ‡เนเธŸเน‰เธก"
 
@@ -1407,85 +1416,98 @@ msgstr "เธชเธญเธšเธ–เธฒเธก"
 msgid "Unable to invoke "
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธฃเธตเธขเธ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "เน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธ›เธขเธฑเธ‡ %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธชเธฃเน‰เธฒเธ‡เธ‹เน‡เธญเธเน€เธเน‡เธ•เธชเธณเธซเธฃเธฑเธš %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธฃเธดเนˆเธกเธเธฒเธฃเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธ›เธขเธฑเธ‡ %s:%s (%s)"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธ›เธขเธฑเธ‡ %s:%s (%s) เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธเธซเธกเธ”เน€เธงเธฅเธฒเธ„เธญเธข"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธ›เธขเธฑเธ‡ %s:%s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "เน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธ›เธขเธฑเธ‡ %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธดเธ”เธซเธฒเธ—เธตเนˆเธญเธขเธนเนˆ '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธŠเธฑเนˆเธงเธ„เธฃเธฒเธงเธ‚เธ“เธฐเน€เธ›เธดเธ”เธซเธฒเธ—เธตเนˆเธญเธขเธนเนˆ '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธฃเน‰เธฒเธขเนเธฃเธ‡เธšเธฒเธ‡เธญเธขเนˆเธฒเธ‡เธ‚เธ“เธฐเน€เธ›เธดเธ”เธซเธฒเธ—เธตเนˆเธญเธขเธนเนˆ '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธฃเน‰เธฒเธขเนเธฃเธ‡เธšเธฒเธ‡เธญเธขเนˆเธฒเธ‡เธ‚เธ“เธฐเน€เธ›เธดเธ”เธซเธฒเธ—เธตเนˆเธญเธขเธนเนˆ '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธ›เธขเธฑเธ‡ %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ เธฒเธขเนƒเธ™: เธฅเธฒเธขเน€เธ‹เน‡เธ™เนƒเธŠเน‰เธเธฒเธฃเน„เธ”เน‰ เนเธ•เนˆเน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธฃเธฐเธšเธธเธฅเธฒเธขเธ™เธดเน‰เธงเธกเธทเธญเธ‚เธญเธ‡เธเธธเธเนเธˆ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "เธžเธšเธฅเธฒเธขเน€เธ‹เน‡เธ™เธ—เธตเนˆเนƒเธŠเน‰เธเธฒเธฃเน„เธกเนˆเน„เธ”เน‰เธญเธขเนˆเธฒเธ‡เธ™เน‰เธญเธขเธซเธ™เธถเนˆเธ‡เธฃเธฒเธขเธเธฒเธฃ"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธฃเธตเธขเธ 'gpgv' เน€เธžเธทเนˆเธญเธ•เธฃเธงเธˆเธชเธญเธšเธฅเธฒเธขเน€เธ‹เน‡เธ™ (เน„เธ”เน‰เธ•เธดเธ”เธ•เธฑเน‰เธ‡ gpgv เน„เธงเน‰เธซเธฃเธทเธญเน„เธกเนˆ?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เน„เธกเนˆเธ—เธฃเธฒเธšเธชเธฒเน€เธซเธ•เธธเธ‚เธ“เธฐเน€เธฃเธตเธขเธ gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "เธฅเธฒเธขเน€เธ‹เน‡เธ™เธ•เนˆเธญเน„เธ›เธ™เธตเน‰เนƒเธŠเน‰เธเธฒเธฃเน„เธกเนˆเน„เธ”เน‰:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1523,53 +1545,53 @@ msgstr "เธเธฒเธฃเธชเธ™เธฑเธšเธชเธ™เธธเธ™ Content-Range เธ—เธตเนˆเน€เธ‹เธดเธฃเนŒ
 msgid "Unknown date format"
 msgstr "เธžเธšเธฃเธนเธ›เนเธšเธšเธงเธฑเธ™เธ—เธตเนˆเธ—เธตเนˆเน„เธกเนˆเธฃเธนเน‰เธˆเธฑเธ"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "select เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "เธซเธกเธ”เน€เธงเธฅเธฒเธฃเธญเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเน€เธ‚เธตเธขเธ™เธฅเธ‡เนเธŸเน‰เธกเธœเธฅเธฅเธฑเธžเธ˜เนŒ"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเน€เธ‚เธตเธขเธ™เธฅเธ‡เนเธŸเน‰เธก"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเน€เธ‚เธตเธขเธ™เธฅเธ‡เนเธŸเน‰เธก"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเธญเนˆเธฒเธ™เธ‚เน‰เธญเธกเธนเธฅเธˆเธฒเธเน€เธ‹เธดเธฃเนŒเธŸเน€เธงเธญเธฃเนŒ เธ›เธฅเธฒเธขเธ—เธฒเธ‡เธญเธตเธเธ”เน‰เธฒเธ™เธซเธ™เธถเนˆเธ‡เธ›เธดเธ”เธเธฒเธฃเน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเธญเนˆเธฒเธ™เธ‚เน‰เธญเธกเธนเธฅเธˆเธฒเธเน€เธ‹เธดเธฃเนŒเธŸเน€เธงเธญเธฃเนŒ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "เธ‚เน‰เธญเธกเธนเธฅเธชเนˆเธงเธ™เธซเธฑเธงเธœเธดเธ”เธžเธฅเธฒเธ”"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "เน€เธŠเธทเนˆเธญเธกเธ•เนˆเธญเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ เธฒเธขเนƒเธ™"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธญเนˆเธฒเธ™ %s"
@@ -1596,7 +1618,12 @@ msgstr "เน„เธกเนˆเธžเธšเนเธŸเน‰เธกเนเธซเธฅเนˆเธ‡เธชเธณเน€เธ™เธฒ '%s'"
 msgid "Can not read mirror file '%s'"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธญเนˆเธฒเธ™เนเธŸเน‰เธกเนเธซเธฅเนˆเธ‡เธชเธณเน€เธ™เธฒ '%s'"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธญเนˆเธฒเธ™เนเธŸเน‰เธกเนเธซเธฅเนˆเธ‡เธชเธณเน€เธ™เธฒ '%s'"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[เนเธซเธฅเนˆเธ‡เธชเธณเน€เธ™เธฒ: %s]"
@@ -1687,7 +1714,7 @@ msgstr ""
 "  -c=?  เธญเนˆเธฒเธ™เนเธŸเน‰เธกเธ„เนˆเธฒเธ•เธฑเน‰เธ‡เธ™เธตเน‰\n"
 "  -o=?  เธเธณเธซเธ™เธ”เธ•เธฑเธงเน€เธฅเธทเธญเธเธ„เนˆเธฒเธ•เธฑเน‰เธ‡เน€เธ›เน‡เธ™เธฃเธฒเธขเธ•เธฑเธง เน€เธŠเนˆเธ™ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ‚เธตเธขเธ™เธฅเธ‡เนเธŸเน‰เธก %s"
@@ -1827,8 +1854,8 @@ msgstr "เธŸเธญเธฃเนŒเนเธกเธ•เธ‚เธญเธ‡ DB เธœเธดเธ” เธ–เน‰เธฒเธ„เธธเธ“เน€เธžเธดเ
 msgid "Unable to open DB file %s: %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธดเธ”เนเธŸเน‰เธก DB %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
@@ -1841,87 +1868,87 @@ msgstr "เนเธžเธเน€เธเธˆเน„เธกเนˆเธกเธตเธฃเธฐเน€เธšเธตเธขเธ™เธ„เธงเธšเธ„เธธเธก
 msgid "Unable to get a cursor"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ™เธณเธ•เธฑเธงเธŠเธตเน‰เธ•เธณเนเธซเธ™เนˆเธ‡เธกเธฒเนƒเธŠเน‰เน„เธ”เน‰"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: เธญเนˆเธฒเธ™เน„เธ”เน€เธฃเธเธ—เธญเธฃเธต %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: stat %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เน€เธเธดเธ”เธเธฑเธšเนเธŸเน‰เธก "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "เธซเธฒเธžเธฒเธ˜เน€เธ•เน‡เธกเธ‚เธญเธ‡ %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "เน€เธ”เธดเธ™เธ—เนˆเธญเธ‡เธ•เน‰เธ™เน„เธกเน‰เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "เน€เธ›เธดเธ” %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "unlink %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** เธฅเธดเธ‡เธเนŒ %s เน„เธ›เธขเธฑเธ‡ %s เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " เธกเธฒเธ–เธถเธ‡เธ‚เธตเธ”เธˆเธณเธเธฑเธ”เธเธฒเธฃ DeLink เธ—เธตเนˆ %sB เนเธฅเน‰เธง\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "เนเธžเธเน€เธเธˆเน„เธกเนˆเธกเธตเธŠเนˆเธญเธ‡เธ‚เน‰เธญเธกเธนเธฅ 'Package'"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s เน„เธกเนˆเธกเธตเธ‚เน‰เธญเธกเธนเธฅ override\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  เธœเธนเน‰เธ”เธนเนเธฅ %s เธ„เธทเธญ %s เน„เธกเนˆเนƒเธŠเนˆ %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s เน„เธกเนˆเธกเธตเธ‚เน‰เธญเธกเธนเธฅ override เธชเธณเธซเธฃเธฑเธšเธ‹เธญเธฃเนŒเธช\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s เน„เธกเนˆเธกเธตเธ‚เน‰เธญเธกเธนเธฅ override เธชเธณเธซเธฃเธฑเธšเน„เธšเธ™เธฒเธฃเธตเน€เธŠเนˆเธ™เธเธฑเธ™\n"
@@ -1995,7 +2022,7 @@ msgstr "เธญเนˆเธฒเธ™เนเธŸเน‰เธกเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆเธ‚เธ“เธฐเธ„เธณเธ™เธง
 msgid "Problem unlinking %s"
 msgstr "เธกเธตเธ›เธฑเธเธซเธฒเธ‚เธ“เธฐเธฅเธšเนเธŸเน‰เธก %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธฅเธตเนˆเธขเธ™เธŠเธทเนˆเธญ %s เน„เธ›เน€เธ›เน‡เธ™ %s"
@@ -2053,23 +2080,23 @@ msgstr ""
 "  -c=? เธญเนˆเธฒเธ™เนเธŸเน‰เธกเธ„เนˆเธฒเธ•เธฑเน‰เธ‡เธ™เธตเน‰\n"
 "  -o=? เธเธณเธซเธ™เธ”เธ•เธฑเธงเน€เธฅเธทเธญเธเธ„เนˆเธฒเธ•เธฑเน‰เธ‡เน€เธ›เน‡เธ™เธฃเธฒเธขเธ•เธฑเธง เน€เธŠเนˆเธ™ -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "เธชเธฃเน‰เธฒเธ‡เน„เธ›เธ›เนŒเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "เน€เธฃเธตเธขเธ gzip เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "เนเธŸเน‰เธกเธˆเธฑเธ”เน€เธเน‡เธšเน€เธชเธตเธขเธซเธฒเธข"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "checksum เธ‚เธญเธ‡เนเธŸเน‰เธก tar เธœเธดเธ”เธžเธฅเธฒเธ” เนเธŸเน‰เธกเธˆเธฑเธ”เน€เธเน‡เธšเน€เธชเธตเธขเธซเธฒเธข"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "เธžเธšเธŠเธ™เธดเธ” %u เธ‚เธญเธ‡เธ‚เน‰เธญเธกเธนเธฅเธชเนˆเธงเธ™เธซเธฑเธง TAR เธ—เธตเนˆเน„เธกเนˆเธฃเธนเน‰เธˆเธฑเธ เธ—เธตเนˆเธชเธกเธฒเธŠเธดเธ %s"
@@ -2140,54 +2167,54 @@ msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ‚เธตเธขเธ™เนเธŸเน‰เธก %s"
 msgid "Failed to close file %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ›เธดเธ”เนเธŸเน‰เธก %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "เธžเธฒเธ˜ %s เธขเธฒเธงเน€เธเธดเธ™เน„เธ›"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "เธžเธขเธฒเธขเธฒเธกเนเธ•เธเนเธžเธเน€เธเธˆ %s เธกเธฒเธเธเธงเนˆเธฒเธซเธ™เธถเนˆเธ‡เธ„เธฃเธฑเน‰เธ‡"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "เน„เธ”เน€เธฃเธเธ—เธญเธฃเธต %s เธ–เธนเธ divert"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "เนเธžเธเน€เธเธˆเธ™เธตเน‰เธžเธขเธฒเธขเธฒเธกเน€เธ‚เธตเธขเธ™เธฅเธ‡เธ›เธฅเธฒเธขเธ—เธฒเธ‡เธ‚เธญเธ‡ diversion %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "เธžเธฒเธ˜เธ‚เธญเธ‡ diversion เธขเธฒเธงเน€เธเธดเธ™เน„เธ›"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "เน„เธ”เน€เธฃเธเธ—เธญเธฃเธต %s เธเธณเธฅเธฑเธ‡เธˆเธฐเธ–เธนเธเนเธ—เธ™เธ—เธตเนˆเธ”เน‰เธงเธขเธชเธดเนˆเธ‡เธ—เธตเนˆเน„เธกเนˆเนƒเธŠเนˆเน„เธ”เน€เธฃเธเธ—เธญเธฃเธต"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "เธซเธฒเน‚เธซเธ™เธ”เนƒเธ™ bucket เธ‚เธญเธ‡เนเธฎเธŠเน„เธกเนˆเธžเธš"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "เธžเธฒเธ˜เธขเธฒเธงเน€เธเธดเธ™เน„เธ›"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "เธžเธšเนเธžเธเน€เธเธˆเธ—เธตเนˆเน€เธ‚เธตเธขเธ™เธ—เธฑเธšเน‚เธ”เธขเน„เธกเนˆเธกเธตเธ‚เน‰เธญเธกเธนเธฅเธฃเธธเนˆเธ™เธชเธณเธซเธฃเธฑเธš %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "เนเธŸเน‰เธก %s/%s เน€เธ‚เธตเธขเธ™เธ—เธฑเธšเนเธŸเน‰เธกเนƒเธ™เนเธžเธเน€เธเธˆ %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ– stat %s"
@@ -2265,30 +2292,30 @@ msgid ""
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธžเธดเนˆเธกเธ‚เธ™เธฒเธ”เธ‚เธญเธ‡ MMap เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธเธœเธนเน‰เนƒเธŠเน‰เธ›เธดเธ”เธเธฒเธฃเธ‚เธขเธฒเธขเธ‚เธ™เธฒเธ”เธญเธฑเธ•เน‚เธ™เธกเธฑเธ•เธด"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liเธงเธฑเธ™ %liเธŠเธก. %liเธ™เธฒเธ—เธต %liเธงเธด"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liเธŠเธก. %liเธ™เธฒเธ—เธต %liเธงเธด"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liเธ™เธฒเธ—เธต %liเธงเธด"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%liเธงเธด"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "เน„เธกเนˆเธžเธšเธฃเธฒเธขเธเธฒเธฃเน€เธฅเธทเธญเธ %s"
@@ -2358,6 +2385,16 @@ msgstr "%c%s... เธœเธดเธ”เธžเธฅเธฒเธ”!"
 msgid "%c%s... Done"
 msgstr "%c%s... เน€เธชเธฃเน‡เธˆเนเธฅเน‰เธง"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... เน€เธชเธฃเน‡เธˆเนเธฅเน‰เธง"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2418,114 +2455,120 @@ msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ– stat เธ‹เธตเธ”เธตเธฃเธญเธก"
 msgid "Problem closing the gzip file %s"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธ‚เธ“เธฐเธ›เธดเธ”เนเธŸเน‰เธก gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "เธˆเธฐเน„เธกเนˆเนƒเธŠเน‰เธเธฒเธฃเธฅเน‡เธญเธ„เธเธฑเธšเนเธŸเน‰เธกเธฅเน‡เธญเธ„ %s เธ—เธตเนˆเธญเนˆเธฒเธ™เน„เธ”เน‰เธญเธขเนˆเธฒเธ‡เน€เธ”เธตเธขเธง"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธดเธ”เนเธŸเน‰เธกเธฅเน‡เธญเธ„ %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "เธˆเธฐเน„เธกเนˆเนƒเธŠเน‰เธเธฒเธฃเธฅเน‡เธญเธ„เธเธฑเธšเนเธŸเน‰เธกเธฅเน‡เธญเธ„ %s เธ—เธตเนˆเน€เธกเธฒเธ™เธ—เนŒเธœเนˆเธฒเธ™ nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธฅเน‡เธญเธ„ %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธชเธฃเน‰เธฒเธ‡เธฃเธฒเธขเธŠเธทเนˆเธญเนเธŸเน‰เธกเน„เธ”เน‰ เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธ '%s' เน„เธกเนˆเนƒเธŠเนˆเน„เธ”เน€เธฃเธเธ—เธญเธฃเธต"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "เธˆเธฐเธฅเธฐเน€เธฅเธข '%s' เนƒเธ™เน„เธ”เน€เธฃเธเธ—เธญเธฃเธต '%s' เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธเน„เธกเนˆเนƒเธŠเนˆเนเธŸเน‰เธกเธ˜เธฃเธฃเธกเธ”เธฒ"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "เธˆเธฐเธฅเธฐเน€เธฅเธข '%s' เนƒเธ™เน„เธ”เน€เธฃเธเธ—เธญเธฃเธต '%s' เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธเน„เธกเนˆเธกเธตเธชเนˆเธงเธ™เธ‚เธขเธฒเธขเนƒเธ™เธŠเธทเนˆเธญเนเธŸเน‰เธก"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "เธˆเธฐเธฅเธฐเน€เธฅเธข '%s' เนƒเธ™เน„เธ”เน€เธฃเธเธ—เธญเธฃเธต '%s' เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธเธชเนˆเธงเธ™เธ‚เธขเธฒเธขเนƒเธ™เธŠเธทเนˆเธญเนเธŸเน‰เธกเน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เนƒเธŠเน‰เธเธฒเธฃเน„เธ”เน‰"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "เน‚เธžเธฃเน€เธ‹เธชเธขเนˆเธญเธข %s เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธญเธ‡เธเธฒเธฃเนƒเธŠเน‰เธขเนˆเธฒเธ™เธซเธ™เนˆเธงเธขเธ„เธงเธฒเธกเธˆเธณ (segmentation fault)"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "เน‚เธžเธฃเน€เธ‹เธชเธขเนˆเธญเธข %s เน„เธ”เน‰เธฃเธฑเธšเธชเธฑเธเธเธฒเธ“ %u"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "เน‚เธžเธฃเน€เธ‹เธชเธขเนˆเธญเธข %s เธ„เธทเธ™เธ„เนˆเธฒเธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ” (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "เน‚เธžเธฃเน€เธ‹เธชเธขเนˆเธญเธข %s เธˆเธšเธเธฒเธฃเธ—เธณเธ‡เธฒเธ™เธเธฐเธ—เธฑเธ™เธซเธฑเธ™"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธดเธ”เนเธŸเน‰เธก %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธดเธ” file destriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "เธชเธฃเน‰เธฒเธ‡ IPC เธ‚เธญเธ‡เน‚เธžเธฃเน€เธ‹เธชเธขเนˆเธญเธขเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "เน€เธฃเธตเธขเธเธ—เธณเธ‡เธฒเธ™เธ•เธฑเธงเธšเธตเธšเธญเธฑเธ”เน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "read: เธขเธฑเธ‡เน€เธซเธฅเธทเธญ %llu เธ—เธตเนˆเธขเธฑเธ‡เน„เธกเนˆเน„เธ”เน‰เธญเนˆเธฒเธ™ เนเธ•เนˆเธ‚เน‰เธญเธกเธนเธฅเธซเธกเธ”เนเธฅเน‰เธง"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "write: เธขเธฑเธ‡เน€เธซเธฅเธทเธญ %llu เธ—เธตเนˆเธขเธฑเธ‡เน„เธกเนˆเน„เธ”เน‰เน€เธ‚เธตเธขเธ™ เนเธ•เนˆเน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ‚เธตเธขเธ™เน„เธ”เน‰"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธ‚เธ“เธฐเธ›เธดเธ”เนเธŸเน‰เธก %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธ‚เธ“เธฐเน€เธ›เธฅเธตเนˆเธขเธ™เธŠเธทเนˆเธญเนเธŸเน‰เธก %s เน„เธ›เน€เธ›เน‡เธ™ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธ‚เธ“เธฐเธฅเธšเนเธŸเน‰เธก %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธ‚เธ“เธฐ sync เนเธŸเน‰เธก"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "เน„เธกเนˆเธกเธตเธžเธงเธ‡เธเธธเธเนเธˆเธ•เธดเธ”เธ•เธฑเน‰เธ‡เน„เธงเน‰เนƒเธ™ %s"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "เนเธ„เธŠเธ‚เธญเธ‡เนเธžเธเน€เธเธˆเธงเนˆเธฒเธ‡เน€เธ›เธฅเนˆเธฒ"
@@ -2551,59 +2594,59 @@ msgstr "APT เธฃเธธเนˆเธ™เธ™เธตเน‰เน„เธกเนˆเธฃเธญเธ‡เธฃเธฑเธšเธฃเธฐเธšเธšเธ™เธฑเธ
 msgid "The package cache was built for a different architecture"
 msgstr "เนเธ„เธŠเธ‚เธญเธ‡เนเธžเธเน€เธเธˆเธ–เธนเธเธชเธฃเน‰เธฒเธ‡เธกเธฒเธชเธณเธซเธฃเธฑเธšเธชเธ–เธฒเธ›เธฑเธ•เธขเธเธฃเธฃเธกเธญเธทเนˆเธ™"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "เธ•เน‰เธญเธ‡เนƒเธŠเน‰"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "เธ•เน‰เธญเธ‡เนƒเธŠเน‰เธ‚เธ“เธฐเธ•เธดเธ”เธ•เธฑเน‰เธ‡"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "เนเธ™เธฐเธ™เธณ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "เธ„เธงเธฃเนƒเธŠเน‰เธฃเนˆเธงเธกเธเธฑเธš"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "เธ‚เธฑเธ”เนเธขเน‰เธ‡เธเธฑเธš"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "เนเธ—เธ™เธ—เธตเนˆ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "เนƒเธŠเน‰เนเธ—เธ™"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "เธ—เธณเนƒเธซเน‰เธžเธฑเธ‡"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "เน€เธžเธดเนˆเธกเธ„เธงเธฒเธกเธชเธฒเธกเธฒเธฃเธ–"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "เธชเธณเธ„เธฑเธ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "เธˆเธณเน€เธ›เน‡เธ™"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "เธกเธฒเธ•เธฃเธเธฒเธ™"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "เธ•เธฑเธงเน€เธฅเธทเธญเธ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "เธชเนˆเธงเธ™เน€เธชเธฃเธดเธก"
 
@@ -2703,17 +2746,17 @@ msgstr "เธเธณเธฅเธฑเธ‡เน€เธ›เธดเธ” %s"
 msgid "Line %u too long in source list %s."
 msgstr "เธšเธฃเธฃเธ—เธฑเธ” %u เนƒเธ™เนเธŸเน‰เธกเธฃเธฒเธขเธŠเธทเนˆเธญเนเธซเธฅเนˆเธ‡เนเธžเธเน€เธเธˆ %s เธขเธฒเธงเน€เธเธดเธ™เน„เธ›"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "เธšเธฃเธฃเธ—เธฑเธ” %u เนƒเธ™เนเธŸเน‰เธกเธฃเธฒเธขเธŠเธทเนˆเธญเนเธซเธฅเนˆเธ‡เนเธžเธเน€เธเธˆ %s เธœเธดเธ”เธฃเธนเธ›เนเธšเธš (เธŠเธ™เธดเธ”)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "เน„เธกเนˆเธฃเธนเน‰เธˆเธฑเธเธŠเธ™เธดเธ” '%s' เธ—เธตเนˆเธšเธฃเธฃเธ—เธฑเธ” %u เนƒเธ™เนเธŸเน‰เธกเธฃเธฒเธขเธŠเธทเนˆเธญเนเธซเธฅเนˆเธ‡เนเธžเธเน€เธเธˆ %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2722,12 +2765,12 @@ msgstr ""
 "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธฑเน‰เธ‡เธ„เนˆเธฒ '%s' เนเธšเธšเธ—เธฑเธ™เธ—เธตเน„เธ”เน‰ เธเธฃเธธเธ“เธฒเธญเนˆเธฒเธ™เธฃเธฒเธขเธฅเธฐเน€เธญเธตเธขเธ”เน€เธžเธดเนˆเธกเน€เธ•เธดเธกเธˆเธฒเธ man 5 apt.conf เธ—เธตเนˆเธซเธฑเธงเธ‚เน‰เธญ "
 "APT::Immediate-Configure (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธ•เธฑเน‰เธ‡เธ„เนˆเธฒ '%s'"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2750,7 +2793,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "เธˆเธณเน€เธ›เน‡เธ™เธ•เน‰เธญเธ‡เธ•เธดเธ”เธ•เธฑเน‰เธ‡เนเธžเธเน€เธเธˆ %s เธ‹เน‰เธณ เนเธ•เนˆเธซเธฒเธ•เธฑเธงเนเธžเธเน€เธเธˆเน„เธกเนˆเธžเธš"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2758,17 +2801,17 @@ msgstr ""
 "เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”: pkgProblemResolver::Resolve เธชเธฃเน‰เธฒเธ‡เธ„เธณเธ•เธญเธšเธ—เธตเนˆเธ—เธณเนƒเธซเน‰เน€เธเธดเธ”เนเธžเธเน€เธเธˆเน€เธชเธตเธข "
 "เธญเธฒเธˆเน€เธเธดเธ”เธˆเธฒเธเนเธžเธเน€เธเธˆเธ—เธตเนˆเธ–เธนเธเธเธณเธซเธ™เธ”เนƒเธซเน‰เธ„เธ‡เธฃเธธเนˆเธ™เน„เธงเน‰"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เนเธเน‰เธ›เธฑเธเธซเธฒเน„เธ”เน‰ เธ„เธธเธ“เน„เธ”เน‰เธ„เธ‡เธฃเธธเนˆเธ™เนเธžเธเน€เธเธˆเธ—เธตเนˆเน€เธชเธตเธขเธญเธขเธนเนˆเน„เธงเน‰"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr "เธ”เธฒเธงเธ™เนŒเน‚เธซเธฅเธ”เนเธŸเน‰เธกเธ”เธฑเธŠเธ™เธตเธšเธฒเธ‡เนเธŸเน‰เธกเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ เธˆเธฐเธ‚เน‰เธฒเธกเธฃเธฒเธขเธเธฒเธฃเธ”เธฑเธ‡เธเธฅเนˆเธฒเธงเน„เธ› เธซเธฃเธทเธญเนƒเธŠเน‰เธ‚เน‰เธญเธกเธนเธฅเน€เธเนˆเธฒเนเธ—เธ™"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "เน„เธกเนˆเธกเธตเน„เธ”เน€เธฃเธเธ—เธญเธฃเธตเธฃเธฒเธขเธŠเธทเนˆเธญเนเธžเธเน€เธเธˆ %spartial"
@@ -2805,17 +2848,17 @@ msgstr "เน„เธกเนˆเธžเธšเน„เธ”เธฃเน€เธงเธญเธฃเนŒเธชเธณเธซเธฃเธฑเธšเธงเธดเธ˜เธตเธ
 msgid "Method %s did not start correctly"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธฃเธตเธขเธเธ—เธณเธ‡เธฒเธ™เธงเธดเธ˜เธตเธเธฒเธฃ %s"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "เธเธฃเธธเธ“เธฒเนƒเธชเนˆเนเธœเนˆเธ™เธŠเธทเนˆเธญ: '%s' เธฅเธ‡เนƒเธ™เน„เธ”เธฃเธงเนŒ '%s' เนเธฅเน‰เธงเธเธ” enter"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "เน„เธกเนˆเธฃเธญเธ‡เธฃเธฑเธšเธฃเธฐเธšเธšเนเธžเธเน€เธเธˆ '%s'"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธฃเธฐเธšเธธเธŠเธ™เธดเธ”เธ‚เธญเธ‡เธฃเธฐเธšเธšเนเธžเธเน€เธเธˆเธ—เธตเนˆเน€เธซเธกเธฒเธฐเธชเธกเน„เธ”เน‰"
 
@@ -2868,14 +2911,14 @@ msgstr "เนเธ„เธŠเธกเธตเธฃเธฐเธšเธšเธ™เธฑเธšเธฃเธธเนˆเธ™เธ—เธตเนˆเน„เธกเนˆเธ•เธฃ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเธ›เธฃเธฐเธกเธงเธฅเธœเธฅ %s (%s%d)"
@@ -2896,26 +2939,26 @@ msgstr "เน‚เธญเน‰ เธ„เธธเธ“เธกเธฒเธ–เธถเธ‡เธ‚เธตเธ”เธˆเธณเธเธฑเธ”เธˆเธณเธ™เธงเธ
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "เน‚เธญเน‰ เธ„เธธเธ“เธกเธฒเธ–เธถเธ‡เธ‚เธตเธ”เธˆเธณเธเธฑเธ”เธˆเธณเธ™เธงเธ™เธ„เธงเธฒเธกเธชเธฑเธกเธžเธฑเธ™เธ˜เนŒเธฃเธฐเธซเธงเนˆเธฒเธ‡เนเธžเธเน€เธเธˆเธ—เธตเนˆ APT เธชเธฒเธกเธฒเธฃเธ–เธฃเธญเธ‡เธฃเธฑเธšเน„เธ”เน‰เนเธฅเน‰เธง"
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "เน„เธกเนˆเธžเธšเนเธžเธเน€เธเธˆ %s %s เธ‚เธ“เธฐเธ›เธฃเธฐเธกเธงเธฅเธœเธฅเธ„เธงเธฒเธกเธ‚เธถเน‰เธ™เธ•เนˆเธญเนเธŸเน‰เธก"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ– stat เธฃเธฒเธขเธเธฒเธฃเนเธžเธเน€เธเธˆเธ‹เธญเธฃเนŒเธช %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "เธเธณเธฅเธฑเธ‡เธญเนˆเธฒเธ™เธฃเธฒเธขเธŠเธทเนˆเธญเนเธžเธเน€เธเธˆ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธเน‡เธšเธ‚เน‰เธญเธกเธนเธฅเนเธŸเน‰เธกเธ—เธตเนˆเธ•เธฃเธฐเน€เธ•เธฃเธตเธขเธกเนƒเธซเน‰"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ” IO เธ‚เธ“เธฐเธšเธฑเธ™เธ—เธถเธเนเธ„เธŠเธ‚เธญเธ‡เธ‹เธญเธฃเนŒเธช"
 
@@ -2928,12 +2971,12 @@ msgstr "เน€เธ›เธฅเธตเนˆเธขเธ™เธŠเธทเนˆเธญเน„เธกเนˆเธชเธณเน€เธฃเน‡เธˆ: %s (%s ->
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum เน„เธกเนˆเธ•เธฃเธ‡เธเธฑเธ™"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "เธœเธฅเธฃเธงเธกเนเธฎเธŠเน„เธกเนˆเธ•เธฃเธ‡เธเธฑเธ™"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2942,16 +2985,16 @@ msgstr ""
 "เน„เธกเนˆเธžเธšเธฃเธฒเธขเธเธฒเธฃ '%s' เธ—เธตเนˆเธ•เน‰เธญเธ‡เธเธฒเธฃเนƒเธ™เนเธŸเน‰เธก Release (เธฃเธฒเธขเธเธฒเธฃ sources.list เน„เธกเนˆเธ–เธนเธเธ•เน‰เธญเธ‡ "
 "เธซเธฃเธทเธญเนเธŸเน‰เธกเธœเธดเธ”เธฃเธนเธ›เนเธšเธš)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "เน„เธกเนˆเธžเธšเธœเธฅเธฃเธงเธกเนเธฎเธŠเธชเธณเธซเธฃเธฑเธš '%s' เนƒเธ™เนเธŸเน‰เธก Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "เน„เธกเนˆเธกเธตเธเธธเธเนเธˆเธชเธฒเธ˜เธฒเธฃเธ“เธฐเธชเธณเธซเธฃเธฑเธšเธเธธเธเนเธˆเธซเธกเธฒเธขเน€เธฅเธ‚เธ•เนˆเธญเน„เธ›เธ™เธตเน‰:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2960,71 +3003,71 @@ msgstr ""
 "เนเธŸเน‰เธก Release เธชเธณเธซเธฃเธฑเธš %s เธซเธกเธ”เธญเธฒเธขเธธเนเธฅเน‰เธง (เธ•เธฑเน‰เธ‡เนเธ•เนˆ %s เธ—เธตเนˆเนเธฅเน‰เธง) เธˆเธฐเน„เธกเนˆเนƒเธŠเน‰เธฃเธฒเธขเธเธฒเธฃเธ›เธฃเธฑเธšเธฃเธธเนˆเธ™เธ•เนˆเธฒเธ‡เน† "
 "เธ‚เธญเธ‡เธ„เธฅเธฑเธ‡เนเธžเธเน€เธเธˆเธ™เธตเน‰"
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "เธŠเธธเธ”เธˆเธฑเธ”เนเธˆเธเธ‚เธฑเธ”เนเธขเน‰เธ‡เธเธฑเธ™: %s (เธ•เน‰เธญเธ‡เธเธฒเธฃ %s เนเธ•เนˆเธžเธš %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเธ•เธฃเธงเธˆเธชเธญเธšเธฅเธฒเธขเน€เธ‹เน‡เธ™ เธˆเธฐเน„เธกเนˆเธ›เธฃเธฑเธšเธ‚เน‰เธญเธกเธนเธฅเธ„เธฅเธฑเธ‡เนเธžเธเน€เธเธˆเธ™เธตเน‰ เนเธฅเธฐเธˆเธฐเนƒเธŠเน‰เนเธŸเน‰เธกเธ”เธฑเธŠเธ™เธตเน€เธเนˆเธฒ "
 "เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธˆเธฒเธ GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธˆเธฒเธ GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "เน„เธกเนˆเธžเธšเนเธŸเน‰เธกเธชเธณเธซเธฃเธฑเธšเนเธžเธเน€เธเธˆ %s เธ„เธธเธ“เธญเธฒเธˆเธ•เน‰เธญเธ‡เนเธเน‰เธ›เธฑเธเธซเธฒเนเธžเธเน€เธเธˆเธ™เธตเน‰เน€เธญเธ‡ (เน„เธกเนˆเธกเธต arch)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr "เน„เธกเนˆเธžเธšเนเธŸเน‰เธกเธชเธณเธซเธฃเธฑเธšเนเธžเธเน€เธเธˆ %s เธ„เธธเธ“เธญเธฒเธˆเธ•เน‰เธญเธ‡เนเธเน‰เธ›เธฑเธเธซเธฒเนเธžเธเน€เธเธˆเธ™เธตเน‰เน€เธญเธ‡"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "เนเธŸเน‰เธกเธ”เธฑเธŠเธ™เธตเนเธžเธเน€เธเธˆเน€เธชเธตเธขเธซเธฒเธข เน„เธกเนˆเธกเธตเธ‚เน‰เธญเธกเธนเธฅ Filename: (เธŠเธทเนˆเธญเนเธŸเน‰เธก) เธชเธณเธซเธฃเธฑเธšเนเธžเธเน€เธเธˆ %s"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "เธ‚เธ™เธฒเธ”เน„เธกเนˆเธ•เธฃเธ‡เธเธฑเธ™"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เนเธˆเธ‡เนเธŸเน‰เธก Release %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "เน„เธกเนˆเธกเธตเธซเธฑเธงเธ‚เน‰เธญเธขเนˆเธญเธขเนƒเธ™เนเธŸเน‰เธก Release %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "เน„เธกเนˆเธกเธตเธฃเธฒเธขเธเธฒเธฃเนเธฎเธŠเนƒเธ™เนเธŸเน‰เธก Release %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "เธฃเธฒเธขเธเธฒเธฃ 'Valid-Until' เน„เธกเนˆเธ–เธนเธเธ•เน‰เธญเธ‡เนƒเธ™เนเธŸเน‰เธก Release %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "เธฃเธฒเธขเธเธฒเธฃ 'Date' เน„เธกเนˆเธ–เธนเธเธ•เน‰เธญเธ‡เนƒเธ™เนเธŸเน‰เธก Release %s"
@@ -3052,7 +3095,7 @@ msgstr "เธเธณเธฅเธฑเธ‡เธ•เธฃเธงเธˆเธชเธญเธšเธŠเธทเนˆเธญเนเธœเนˆเธ™.. "
 msgid "Stored label: %s\n"
 msgstr "เธŠเธทเนˆเธญเธ—เธตเนˆเน€เธเน‡เธšเน„เธงเน‰: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธฅเธดเธเน€เธกเธฒเธ™เธ—เนŒเธ‹เธตเธ”เธตเธฃเธญเธก...\n"
 
@@ -3114,30 +3157,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "เธเธณเธฅเธฑเธ‡เธ„เธฑเธ”เธฅเธญเธเธฃเธฒเธขเธŠเธทเนˆเธญเนเธžเธเน€เธเธˆ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธ‚เธตเธขเธ™เธฃเธฒเธขเธŠเธทเนˆเธญเนเธซเธฅเนˆเธ‡เนเธžเธเน€เธเธˆเนเธซเธฅเนˆเธ‡เนƒเธซเธกเนˆ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "เธšเธฃเธฃเธ—เธฑเธ”เธฃเธฒเธขเธŠเธทเนˆเธญเนเธซเธฅเนˆเธ‡เนเธžเธเน€เธเธˆเธชเธณเธซเธฃเธฑเธšเนเธœเนˆเธ™เธ™เธตเน‰เธ„เธทเธญ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "เน€เธ‚เธตเธขเธ™เนเธฅเน‰เธง %i เธฃเธฐเน€เธšเธตเธขเธ™\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เน€เธ‚เธตเธขเธ™เนเธฅเน‰เธง %i เธฃเธฐเน€เธšเธตเธขเธ™ เน‚เธ”เธขเธกเธตเนเธŸเน‰เธกเธ‚เธฒเธ”เธซเธฒเธข %i เนเธŸเน‰เธก\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เน€เธ‚เธตเธขเธ™เนเธฅเน‰เธง %i เธฃเธฐเน€เธšเธตเธขเธ™ เน‚เธ”เธขเธกเธตเนเธŸเน‰เธกเธœเธดเธ”เธ‚เธ™เธฒเธ” %i เนเธŸเน‰เธก\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "เน€เธ‚เธตเธขเธ™เนเธฅเน‰เธง %i เธฃเธฐเน€เธšเธตเธขเธ™ เน‚เธ”เธขเธกเธตเนเธŸเน‰เธกเธ‚เธฒเธ”เธซเธฒเธข %i เนเธŸเน‰เธก เนเธฅเธฐเนเธŸเน‰เธกเธœเธดเธ”เธ‚เธ™เธฒเธ” %i เนเธŸเน‰เธก\n"
@@ -3152,17 +3195,6 @@ msgstr "เน„เธกเนˆเธžเธšเธฃเธฐเน€เธšเธตเธขเธ™เธขเธทเธ™เธขเธฑเธ™เธ„เธงเธฒเธกเนเธ—
 msgid "Hash mismatch for: %s"
 msgstr "เนเธฎเธŠเน„เธกเนˆเธ•เธฃเธ‡เธเธฑเธ™เธชเธณเธซเธฃเธฑเธš: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "เนเธŸเน‰เธก %s เน„เธกเนˆเน„เธ”เน‰เธ‚เธถเน‰เธ™เธ•เน‰เธ™เธ”เน‰เธงเธขเธเธฒเธฃเธฃเธฐเธšเธธเธเธฒเธฃเน€เธ‹เน‡เธ™เธเธณเธเธฑเธšเธ„เธฃเธญเธšเนƒเธ™เธ•เธฑเธงเธ‚เน‰เธญเธ„เธงเธฒเธก"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "เน„เธกเนˆเธกเธตเธžเธงเธ‡เธเธธเธเนเธˆเธ•เธดเธ”เธ•เธฑเน‰เธ‡เน„เธงเน‰เนƒเธ™ %s"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3227,122 +3259,122 @@ msgstr "เน€เธ•เธฃเธตเธขเธกเธฃเธฑเธšเธ„เธณเธ•เธญเธš"
 msgid "External solver failed without a proper error message"
 msgstr "เธเธฅเน„เธเธเธฒเธฃเนเธเน‰เธ›เธฑเธเธซเธฒเธ เธฒเธขเธ™เธญเธเธ—เธณเธ‡เธฒเธ™เธฅเน‰เธกเน€เธซเธฅเธงเน‚เธ”เธขเน„เธกเนˆเธกเธตเธ‚เน‰เธญเธ„เธงเธฒเธกเธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ—เธตเนˆเน€เธซเธกเธฒเธฐเธชเธก"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "เน€เธฃเธตเธขเธเธเธฅเน„เธเธเธฒเธฃเนเธเน‰เธ›เธฑเธเธซเธฒเธ เธฒเธขเธ™เธญเธ"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "เธเธณเธฅเธฑเธ‡เธ•เธดเธ”เธ•เธฑเน‰เธ‡ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "เธเธณเธฅเธฑเธ‡เธ•เธฑเน‰เธ‡เธ„เนˆเธฒ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "เธเธณเธฅเธฑเธ‡เธ–เธญเธ”เธ–เธญเธ™ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "เธเธณเธฅเธฑเธ‡เธ–เธญเธ”เธ–เธญเธ™ %s เธญเธขเนˆเธฒเธ‡เธชเธกเธšเธนเธฃเธ“เนŒ"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "เธเธณเธฅเธฑเธ‡เธˆเธ”เธšเธฑเธ™เธ—เธถเธเธเธฒเธฃเธซเธฒเธขเน„เธ›เธ‚เธญเธ‡ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธฃเธตเธขเธเธเธฒเธฃเธชเธฐเธเธดเธ” %s เธซเธฅเธฑเธ‡เธเธฒเธฃเธ•เธดเธ”เธ•เธฑเน‰เธ‡"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "เน„เธกเนˆเธกเธตเน„เธ”เน€เธฃเธเธ—เธญเธฃเธต '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ›เธดเธ”เนเธŸเน‰เธก '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธ•เธฃเธตเธขเธก %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "เธเธณเธฅเธฑเธ‡เนเธ•เธเนเธžเธเน€เธเธˆ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธ•เธฃเธตเธขเธกเธ•เธฑเน‰เธ‡เธ„เนˆเธฒ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "เธ•เธดเธ”เธ•เธฑเน‰เธ‡ %s เนเธฅเน‰เธง"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธ•เธฃเธตเธขเธกเธ–เธญเธ”เธ–เธญเธ™ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "เธ–เธญเธ”เธ–เธญเธ™ %s เนเธฅเน‰เธง"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธ•เธฃเธตเธขเธกเธ–เธญเธ”เธ–เธญเธ™ %s เธญเธขเนˆเธฒเธ‡เธชเธกเธšเธนเธฃเธ“เนŒ"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "เธ–เธญเธ”เธ–เธญเธ™ %s เธญเธขเนˆเธฒเธ‡เธชเธกเธšเธนเธฃเธ“เนŒเนเธฅเน‰เธง"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เน€เธ‚เธตเธขเธ™เธšเธฑเธ™เธ—เธถเธเธ›เธเธดเธšเธฑเธ•เธดเธเธฒเธฃ เน€เธ™เธทเนˆเธญเธ‡เธˆเธฒเธ openpty() เธฅเน‰เธกเน€เธซเธฅเธง (เน„เธกเนˆเน„เธ”เน‰เน€เธกเธฒเธ™เธ—เนŒ /dev/pts "
 "เธซเธฃเธทเธญเน€เธ›เธฅเนˆเธฒ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "เธเธณเธฅเธฑเธ‡เน€เธฃเธตเธขเธ dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "เธ›เธเธดเธšเธฑเธ•เธดเธเธฒเธฃเธ–เธนเธเธ‚เธฑเธ”เธˆเธฑเธ‡เธซเธงเธฐเธเนˆเธญเธ™เธ—เธตเนˆเธˆเธฐเธชเธฒเธกเธฒเธฃเธ–เธ—เธณเธ‡เธฒเธ™เน€เธชเธฃเน‡เธˆ"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "เน„เธกเนˆเธกเธตเธเธฒเธฃเน€เธ‚เธตเธขเธ™เธฃเธฒเธขเธ‡เธฒเธ™ apport เน€เธžเธฃเธฒเธฐเธ–เธถเธ‡เธ‚เธตเธ”เธˆเธณเธเธฑเธ” MaxReports เนเธฅเน‰เธง"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "เธกเธตเธ›เธฑเธเธซเธฒเธ„เธงเธฒเธกเธ‚เธถเน‰เธ™เธ•เนˆเธญเธเธฑเธ™ - เธˆเธฐเธ—เธดเน‰เธ‡เน„เธงเน‰เน‚เธ”เธขเน„เธกเนˆเธ•เธฑเน‰เธ‡เธ„เนˆเธฒ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 "เน„เธกเนˆเธกเธตเธเธฒเธฃเน€เธ‚เธตเธขเธ™เธฃเธฒเธขเธ‡เธฒเธ™ apport เน€เธžเธฃเธฒเธฐเธ‚เน‰เธญเธ„เธงเธฒเธกเธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธฃเธฐเธšเธธเธงเนˆเธฒเน€เธ›เน‡เธ™เธชเธดเนˆเธ‡เธ—เธตเนˆเธ•เธฒเธกเธกเธฒเธˆเธฒเธเธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธเนˆเธญเธ™เธซเธ™เน‰เธฒ"
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3354,13 +3386,7 @@ msgid ""
 "error"
 msgstr "เน„เธกเนˆเธกเธตเธเธฒเธฃเน€เธ‚เธตเธขเธ™เธฃเธฒเธขเธ‡เธฒเธ™ apport เน€เธžเธฃเธฒเธฐเธ‚เน‰เธญเธ„เธงเธฒเธกเธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธฃเธฐเธšเธธเธงเนˆเธฒเน€เธเธดเธ”เธˆเธฒเธเธซเธ™เนˆเธงเธขเธ„เธงเธฒเธกเธˆเธณเน€เธ•เน‡เธก"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3390,20 +3416,8 @@ msgstr "dpkg เธ–เธนเธเธ‚เธฑเธ”เธˆเธฑเธ‡เธซเธงเธฐ เธ„เธธเธ“เธ•เน‰เธญเธ‡เน€เธฃเธต
 msgid "Not locked"
 msgstr "เน„เธกเนˆเน„เธ”เน‰เธฅเน‡เธญเธ„เธญเธขเธนเนˆ"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "เน€เธเธดเธ”เธ›เธฑเธเธซเธฒเธฃเน‰เธฒเธขเนเธฃเธ‡เธšเธฒเธ‡เธญเธขเนˆเธฒเธ‡เธ‚เธ“เธฐเน€เธ›เธดเธ”เธซเธฒเธ—เธตเนˆเธญเธขเธนเนˆ '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... เน€เธชเธฃเน‡เธˆเนเธฅเน‰เธง"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธ‚เธ“เธฐเธ•เธฃเธงเธˆเธชเธญเธšเธฅเธฒเธขเน€เธ‹เน‡เธ™ เธˆเธฐเน„เธกเนˆเธ›เธฃเธฑเธšเธ‚เน‰เธญเธกเธนเธฅเธ„เธฅเธฑเธ‡เนเธžเธเน€เธเธˆเธ™เธตเน‰ เนเธฅเธฐเธˆเธฐเนƒเธŠเน‰เนเธŸเน‰เธกเธ”เธฑเธŠเธ™เธตเน€เธเนˆเธฒ "
-#~ "เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เธˆเธฒเธ GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "เนเธŸเน‰เธก %s เน„เธกเนˆเน„เธ”เน‰เธ‚เธถเน‰เธ™เธ•เน‰เธ™เธ”เน‰เธงเธขเธเธฒเธฃเธฃเธฐเธšเธธเธเธฒเธฃเน€เธ‹เน‡เธ™เธเธณเธเธฑเธšเธ„เธฃเธญเธšเนƒเธ™เธ•เธฑเธงเธ‚เน‰เธญเธ„เธงเธฒเธก"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "เน„เธกเนˆเธชเธฒเธกเธฒเธฃเธ–เธฅเธš %s"
diff --git a/po/tl.po b/po/tl.po
index 59da4d240..f5059f3e8 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -101,73 +101,73 @@ msgstr "Kabuuan ng puwang na napag-tuosan: "
 msgid "Package file %s is out of sync."
 msgstr "Wala sa sync ang talaksan ng paketeng %s."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Walang nahanap na mga pakete"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(wala)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -243,21 +243,29 @@ msgstr ""
 "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
 "karagdagang impormasyon\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
 
@@ -493,7 +501,7 @@ msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
@@ -607,8 +615,8 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -647,7 +655,7 @@ msgstr "Abort."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Nais niyo bang magpatuloy [O/h]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"
@@ -656,7 +664,7 @@ msgstr "Bigo sa pagkuha ng %s  %s\n"
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
@@ -734,7 +742,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
@@ -785,7 +793,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -796,85 +804,85 @@ msgstr ""
 "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
 "kailangan na hindi pa nalikha o linipat mula sa Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "Sinusuri ang pag-upgrade... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Bigo"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Tapos"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -882,85 +890,85 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kulang kayo ng libreng puwang sa %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -969,7 +977,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -978,14 +986,14 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng "
 "%s ay bagong-bago pa lamang."
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -994,7 +1002,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
 "ng paketeng %s na tumutugon sa kinakailangang bersyon"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1003,30 +1011,30 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1111,7 +1119,7 @@ msgstr ""
 "para sa karagdagang impormasyon at mga option.\n"
 "                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1182,7 +1190,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -1320,8 +1329,8 @@ msgstr "Lumipas ang koneksyon"
 msgid "Server closed the connection"
 msgstr "Sinarhan ng server ang koneksyon"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Error sa pagbasa"
 
@@ -1334,8 +1343,8 @@ msgid "Protocol corruption"
 msgstr "Sira ang protocol"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Error sa pagsulat"
 
@@ -1389,7 +1398,7 @@ msgstr "Nag-timeout ang socket ng datos"
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
@@ -1416,89 +1425,102 @@ msgstr "Tanong"
 msgid "Unable to invoke "
 msgstr "Hindi ma-invoke "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Hindi maka-konekta sa %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kumokonekta sa %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Hindi maresolba ang '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Hindi maka-konekta sa %s %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
 "fingerprint?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1538,53 +1560,53 @@ msgstr "Sira ang range support ng HTTP server na ito"
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Internal na error"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
@@ -1611,7 +1633,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Hindi mabuksan ang talaksang %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1706,7 +1733,7 @@ msgstr ""
 "  -c=? Basahin ang talaksang pagkaayos na ito\n"
 "  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Hindi makapagsulat sa %s"
@@ -1857,8 +1884,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Hindi mabuksan ang talaksang DB %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Bigo ang pag-stat ng %s"
@@ -1871,87 +1898,87 @@ msgstr "Walang kontrol rekord ang arkibo"
 msgid "Unable to get a cursor"
 msgstr "Hindi makakuha ng cursor"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Hindi mabasa ang directory %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Hindi ma-stat %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "E: Mga error ay tumutukoy sa talaksang "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Bigo sa pag-resolba ng %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Bigo ang paglakad sa puno"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Bigo ang pagbukas ng %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Bigo ang pagbasa ng link %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Bigo ang pag-unlink ng %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Bigo ang pag-link ng %s sa %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit na %sB tinamaan.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Walang field ng pakete ang arkibo"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ay walang override entry\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ay walang override entry para sa pinagmulan\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ay wala ring override entry na binary\n"
@@ -2025,7 +2052,7 @@ msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
 msgid "Problem unlinking %s"
 msgstr "Problema sa pag-unlink ng %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
@@ -2084,23 +2111,23 @@ msgstr ""
 "  -c=? Basahin ang talaksang pagkaayos na ito\n"
 "  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Bigo sa paglikha ng mga pipe"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Bigo sa pagtakbo ng gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Sirang arkibo"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
@@ -2171,54 +2198,54 @@ msgstr "Bigo sa pagsulat ng talaksang %s"
 msgid "Failed to close file %s"
 msgstr "Bigo sa pagsara ng talaksang %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "Sobrang haba ang path na %s"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Binubuklat ang %s ng labis sa isang beses"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ang directory %s ay divertado"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "Sobrang haba ng path na diversion"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Ang directory %s ay papalitan ng hindi-directory"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "Sobrang haba ng path"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Hindi ma-stat ang %s"
@@ -2298,30 +2325,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"
@@ -2393,6 +2420,16 @@ msgstr "%c%s... Error!"
 msgid "%c%s... Done"
 msgstr "%c%s... Tapos"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Tapos"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2455,117 +2492,123 @@ msgstr "Bigo sa pag-stat ng cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Hindi mabuksan ang talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
 "nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "hindi makuha ang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Naghudyat ang sub-process %s ng error code (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Bigo ang paglikha ng subprocess IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Bigo ang pag-exec ng taga-compress"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema sa pag-sync ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema sa pag-unlink ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Problema sa pag-sync ng talaksan"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Walang laman ang cache ng pakete"
@@ -2592,59 +2635,59 @@ msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'"
 msgid "The package cache was built for a different architecture"
 msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Dependensiya"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "Mungkahi"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Rekomendado"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Tunggali"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Pumapalit"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Linalaos"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "kailangan"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "extra"
 
@@ -2745,29 +2788,29 @@ msgstr "Binubuksan %s"
 msgid "Line %u too long in source list %s."
 msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2792,7 +2835,7 @@ msgstr ""
 "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
 "para dito."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2800,12 +2843,12 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
 "ito ng mga paketeng naka-hold."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2814,7 +2857,7 @@ msgstr ""
 "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
 "mga luma na lamang."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Nawawala ang directory ng talaan %spartial."
@@ -2851,18 +2894,18 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
 msgid "Method %s did not start correctly"
 msgstr "Hindi umandar ng tama ang paraang %s"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Hindi suportado ang sistema ng paketeng '%s'"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
@@ -2918,14 +2961,14 @@ msgstr "Hindi akma ang versioning system ng cache"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
@@ -2948,27 +2991,27 @@ msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "Binabasa ang Listahan ng mga Pakete"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "Kinukuha ang Talaksang Provides"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "IO Error sa pag-imbak ng source cache"
 
@@ -2981,54 +3024,54 @@ msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3037,7 +3080,7 @@ msgstr ""
 "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
 "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3046,7 +3089,7 @@ msgstr ""
 "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
 "niyong ayusin ng de kamay ang paketeng ito."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3054,31 +3097,31 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Di tanggap na linya sa talaksang diversion: %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
@@ -3106,7 +3149,7 @@ msgstr "Kinikilala..."
 msgid "Stored label: %s\n"
 msgstr "Naka-imbak na Label: %s \n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Ina-unmount ang CD-ROM..."
@@ -3169,30 +3212,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Kinokopya ang Listahan ng mga Pakete"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3209,17 +3252,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Ina-abort ang pag-instol."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3283,119 +3315,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "Isasaayos ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3407,13 +3439,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3443,14 +3469,6 @@ msgid "Not locked"
 msgstr ""
 
 #, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Tapos"
-
-#, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
diff --git a/po/uk.po b/po/uk.po
index 59ba1d9ad..f42773acd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: ะฃะบั€ะฐั—ะฝััŒะบะฐ <uk@li.org>\n"
@@ -105,72 +105,72 @@ msgstr "ะ—ะฐะณะฐะปัŒะฝะธะน ะฟั€ะพัั‚ั–ั€ ะฟะพะปั–ั‡ะตะฝะธะน ะดะปั: "
 msgid "Package file %s is out of sync."
 msgstr "ะŸะตั€ะตะปั–ะบ ะฟะฐะบัƒะฝะบั–ะฒ %s ั€ะพะทัะธะฝั…ั€ะพะฝั–ะทะพะฒะฐะฝะธะน."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ะะต ะทะฝะฐะนะดะตะฝะพ ะถะพะดะฝะพะณะพ ะฟะฐะบัƒะฝะบะฐ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "ะ’ะธ ะฟะพะฒะธะฝะฝั– ะทะฐะดะฐั‚ะธ ะฝะต ะผะตะฝัˆะต ะพะดะฝะพะณะพ ัˆะฐะฑะปะพะฝัƒ ะฟะพัˆัƒะบัƒ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "ะฆั ะบะพะผะฐะฝะดะฐ ั” ะทะฐัั‚ะฐั€ั–ะปะพัŽ. ะ‘ัƒะดัŒ-ะปะฐัะบะฐ ะฒะธะบะพั€ะธัั‚ะพะฒัƒะนั‚ะต 'apt-mark showauto'"
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ะะต ะผะพะถัƒ ะทะฝะฐะนั‚ะธ ะฟะฐะบัƒะฝะพะบ %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ะŸะตั€ะตะปั–ะบะธ ะฟะฐะบัƒะฝะบั–ะฒ:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ะšะตัˆ ะฝะต ัะธะฝั…ั€ะพะฝั–ะทะพะฒะฐะฝะธะน, ะฝะตะผะพะถะปะธะฒะพ ะทะฝะฐะนั‚ะธ ะฟะพัะธะปะฐะฝะฝั ะฝะฐ ะฟะตั€ะตะปั–ะบ ะฟะฐะบัƒะฝะบั–ะฒ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "ะ—ะฐั„ั–ะบัะพะฒะฐะฝั– ะฟะฐะบัƒะฝะบะธ:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ะฝะต ะทะฝะฐะนะดะตะฝะพ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ะ’ัั‚ะฐะฝะพะฒะปะตะฝะพ: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ะšะฐะฝะดะธะดะฐั‚: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ะฒั–ะดััƒั‚ะฝั–ะน)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ะคั–ะบัะฐั‚ะพั€(pin) ะฟะฐะบัƒะฝะบะฐ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ะขะฐะฑะปะธั†ั ะฒะตั€ัั–ะน:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ะดะปั %s ัะบะพะผะฟั–ะปัŒะพะฒะฐะฝะพ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,20 +240,28 @@ msgstr ""
 "  -o=? ะ’ัั‚ะฐะฝะพะฒะธั‚ะธ ัƒะผะพะฒะฝัƒ ะพะฟั†ั–ัŽ ะบะพะฝั„ั–ะณัƒั€ะฐั†ั–ั—, ะฝะฐะฟั€ะธะบะปะฐะด, -o dir::cache=/tmp\n"
 "ะ”ะธะฒั–ั‚ัŒัั ะฟะพะดั€ะพะฑะธั†ั– ะฝะฐ man-ัั‚ะพั€ั–ะฝะบะฐั… apt-cache(8) ั– apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "ะ—ะฐะดะฐะนั‚ะต ะฝะฐะทะฒัƒ ะดะปั ั†ัŒะพะณะพ ะ”ะธัะบะฐ, ะฝะฐะฟั€ะธะบะปะฐะด 'Debian 5.0.3 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ะ‘ัƒะดัŒ-ะปะฐัะบะฐ, ะฒัั‚ะฐะฒั‚ะต ะ”ะธัะบ ัƒ ะฟั€ะธัั‚ั€ั–ะน ั– ะฝะฐั‚ะธัะฝั–ั‚ัŒ Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฟั–ะด'ั”ะดะฝะฐั‚ะธ '%s' ะดะพ '%s'"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ะŸะพะฒั‚ะพั€ั–ั‚ัŒ ั†ะตะน ะฟั€ะพั†ะตั ะดะปั ั€ะตัˆั‚ะธ CD ะท ะฒะฐัˆะพะณะพ ะฝะฐะฑะพั€ัƒ."
 
@@ -491,7 +499,7 @@ msgstr "ะŸะตั€ะตะฒัั‚ะฐะฝะพะฒะปะตะฝะฝั %s ะฝะตะผะพะถะปะธะฒะต, ะฑะพ ะฒั–ะฝ ะฝะต
 msgid "%s is already the newest version.\n"
 msgstr "ะ’ะถะต ะฒัั‚ะฐะฝะพะฒะปะตะฝะฐ ะฝะฐะนะฝะพะฒั–ัˆะฐ ะฒะตั€ัั–ั %s.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ะฟะพะทะฝะฐั‡ะตะฝะธะน ัะบ ะฒัั‚ะฐะฝะพะฒะปะตะฝะธะน ะฒั€ัƒั‡ะฝัƒ.\n"
@@ -603,8 +611,8 @@ msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "ะŸั–ัะปั ั†ั–ั”ั— ะพะฟะตั€ะฐั†ั–ั— ะพะฑ'ั”ะผ ะทะฐะนะฝัั‚ะพะณะพ ะดะธัะบะพะฒะพะณะพ ะฟั€ะพัั‚ะพั€ัƒ ะทะผะตะฝัˆะธั‚ัŒัั ะฝะฐ %sB.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒะธะทะฝะฐั‡ะธั‚ะธ ะบั–ะปัŒะบั–ัั‚ัŒ ะฒั–ะปัŒะฝะพะณะพ ะผั–ัั†ั ะฒ %s"
@@ -644,7 +652,7 @@ msgstr "ะŸะตั€ะตั€ะฒะฐะฝะพ."
 msgid "Do you want to continue [Y/n]? "
 msgstr "ะ‘ะฐะถะฐั”ั‚ะต ะฟั€ะพะดะพะฒะถะธั‚ะธ [Y/n]? "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ะะต ะฒะดะฐะปะพัั ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ %s  %s\n"
@@ -653,7 +661,7 @@ msgstr "ะะต ะฒะดะฐะปะพัั ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "ะ”ะตัะบั– ั„ะฐะนะปะธ ะฝะต ะฒะดะฐะปะพัั ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ะ—ะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั ะทะฐะฒะตั€ัˆะตะฝะพ ะฒ ั€ะตะถะธะผั– \"ั‚ั–ะปัŒะบะธ ะทะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั\""
 
@@ -740,7 +748,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ะะฐัั‚ัƒะฟะฝะฐ ั–ะฝั„ะพั€ะผะฐั†ั–ั ะผะพะถะปะธะฒะพ ะดะพะฟะพะผะพะถะต ะ’ะฐะผ ะฒะธะฟั€ะฐะฒะธั‚ะธ ัะธั‚ัƒะฐั†ั–ัŽ:"
 
@@ -795,7 +803,7 @@ msgstr ""
 "ะะตะทะฐะดะพะฒะพะปะตะฝั– ะทะฐะปะตะถะฝะพัั‚ั–. ะกะฟั€ะพะฑัƒะนั‚ะต ะฒะธะบะพะฝะฐั‚ะธ 'apt-get -f install', ะฝะต "
 "ะฒะบะฐะทัƒัŽั‡ะธ ะฝะฐะทะฒ ะฟะฐะบัƒะฝะบั–ะฒ (ะฐะฑะพ ะฒะบะฐะถั–ั‚ัŒ ั€ั–ัˆะตะฝะฝั)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -806,33 +814,33 @@ msgstr ""
 "ะฐะฑะพ ะถ ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ะต ะฝะตัั‚ะฐะฑั–ะปัŒะฝะธะน ะดะธัั‚ั€ะธะฑัƒั‚ะธะฒ, ั– ะทะฐะฟะธั‚ะฐะฝั– ะ’ะฐะผะธ ะฟะฐะบัƒะฝะบะธ\n"
 "ั‰ะต ะฝะต ัั‚ะฒะพั€ะตะฝั– ะฐะฑะพ ะฑัƒะปะธ ะฒะธะปัƒั‡ะตะฝั– ะท Incoming."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ะ—ะปะฐะผะฐะฝั– ะฟะฐะบัƒะฝะบะธ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ะ‘ัƒะดัƒั‚ัŒ ะฒัั‚ะฐะฝะพะฒะปะตะฝั– ะฝะฐัั‚ัƒะฟะฝั– ะดะพะดะฐั‚ะบะพะฒั– ะฟะฐะบัƒะฝะบะธ:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ะŸั€ะพะฟะพะฝะพะฒะฐะฝั– ะฟะฐะบัƒะฝะบะธ:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ะ ะตะบะพะผะตะฝะดะพะฒะฐะฝั– ะฟะฐะบัƒะฝะบะธ:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ะะต ะผะพะถัƒ ะทะฝะฐะนั‚ะธ ะฟะฐะบัƒะฝะพะบ %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ะฟะพะทะฝะฐั‡ะตะฝะธะน ัะบ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ะฒัั‚ะฐะฝะพะฒะปะตะฝะธะน.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -840,48 +848,48 @@ msgstr ""
 "ะฆั ะบะพะผะฐะฝะดะฐ ะทะฐัั‚ะฐั€ั–ะปะฐ. ะ‘ัƒะดัŒ-ะปะฐัะบะฐ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒะนั‚ะต ะทะฐะผั–ัั‚ัŒ ะฝะตั— 'apt-mark auto' "
 "ั– 'apt-mark manual'."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ะžะฑั‡ะธัะปะตะฝะฝั ะพะฝะพะฒะปะตะฝัŒ... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ะะตะฒะดะฐั‡ะฐ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ะ’ะธะบะพะฝะฐะฝะพ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ะ’ะฝัƒั‚ั€ั–ัˆะฝั ะฟะพะผะธะปะบะฐ, ะฒะธั€ั–ัˆัƒะฒะฐั‡ ะฟั€ะพะฑะปะตะผ ั‰ะพััŒ ะฟะพะปะฐะผะฐะฒ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฐะฑะปะพะบัƒะฒะฐั‚ะธ ะดะธั€ะตะบั‚ะพั€ั–ัŽ ะดะปั ะทะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฝะฐะนั‚ะธ ะดะถะตั€ะตะปะพ ะดะปั ะทะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั ะฒะตั€ัั–ั— '%s' ะดะปั '%s'"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "ะ—ะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ะ’ะบะฐะถั–ั‚ัŒ ัะบ ะผั–ะฝั–ะผัƒะผ ะพะดะธะฝ ะฟะฐะบัƒะฝะพะบ, ะดะปั ัะบะพะณะพ ะฝะตะพะฑั…ั–ะดะฝะพ ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ ะฒะธั…ั–ะดะฝั– "
 "ั‚ะตะบัั‚ะธ"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฝะฐะนั‚ะธ ะฟะฐะบัƒะฝะพะบ ะท ะฒะธั…ั–ะดะฝะธะผะธ ั‚ะตะบัั‚ะฐะผะธ ะดะปั %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -890,7 +898,7 @@ msgstr ""
 "ะฃะ’ะะ“ะ: ะŸะฐะบัƒะฒะฐะฝะฝั '%s' ะฒั–ะดะฑัƒะฒะฐั”ั‚ัŒัั ะฒ ัะธัั‚ะตะผั– ะบะพะฝั‚ั€ะพะปัŽ ะฒะตั€ัั–ะน '%s' ะฝะฐ:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -901,71 +909,71 @@ msgstr ""
 "bzr branch %s\n"
 "ั‰ะพะฑ ะพั‚ั€ะธะผะฐั‚ะธ ะฝะฐะนะฝะพะฒั–ัˆั– (ะฟะพั‚ะตะฝั†ั–ะนะฝะพ ะฝะต ะฒะธะฟัƒั‰ะตะฝั–) ะพะฝะพะฒะปะตะฝะฝั ะดะพ ะฟะฐะบัƒะฝะบัƒ.\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ะŸั€ะพะฟัƒัะบะฐั”ะผะพ ะฒะถะต ะทะฐะฒะฐะฝั‚ะฐะถะตะฝะธะน ั„ะฐะนะป '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ะะตะดะพัั‚ะฐั‚ะฝัŒะพ ะผั–ัั†ั ะฒ %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ะะตะพะฑั…ั–ะดะฝะพ ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ %sB/%sB ะท ะฐั€ั…ั–ะฒั–ะฒ ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ะŸะพั‚ั€ั–ะฑะฝะพ ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ %sB ะฐั€ั…ั–ะฒั–ะฒ ะท ะฒะธั…ั–ะดะฝะธะผะธ ั‚ะตะบัั‚ะฐะผะธ.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ะ—ะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ะ”ะตัะบั– ะฐั€ั…ั–ะฒะธ ะฝะต ะฒะดะฐะปะพัั ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "ะŸั€ะพะฟัƒัะบะฐั”ั‚ัŒัั ั€ะพะทะฟะฐะบัƒะฒะฐะฝะฝั ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ, ั‚ะพะผัƒ ั‰ะพ ะฒะถะต ั€ะพะทะฟะฐะบะพะฒะฐะฝะพ ะฒ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ะšะพะผะฐะฝะดะฐ ั€ะพะทะฟะฐะบัƒะฒะฐะฝะฝั '%s' ะทะฐะฒะตั€ัˆะธะปะฐัั ะฝะตะฒะดะฐะปะพ.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ะŸะตั€ะตะฒั–ั€ั‚ะต, ั‡ะธ ะฒัั‚ะฐะฝะพะฒะปะตะฝะธะน ะฟะฐะบัƒะฝะพะบ 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ะšะพะผะฐะฝะดะฐ ะฟะพะฑัƒะดะพะฒะธ '%s' ะทะฐะบั–ะฝั‡ะธะปะฐัั ะฝะตะฒะดะฐะปะพ.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ะŸะพั€ะพะดะถะตะฝะธะน ะฟั€ะพั†ะตั ะทะฐะฒะตั€ัˆะธะฒัั ะฝะตะฒะดะฐะปะพ"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ะ”ะปั ะฟะตั€ะตะฒั–ั€ะบะธ ะทะฐะปะตะถะฝะพัั‚ะตะน ะดะปั ะฟะพะฑัƒะดะพะฒะธ ะฝะตะพะฑั…ั–ะดะฝะพ ะฒะบะฐะทะฐั‚ะธ ัะบ ะผั–ะฝั–ะผัƒะผ ะพะดะธะฝ "
 "ะฟะฐะบัƒะฝะพะบ"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -974,17 +982,17 @@ msgstr ""
 "ะ’ั–ะดััƒั‚ะฝั ั–ะฝั„ะพั€ะผะฐั†ั–ั ะฟั€ะพ ะฐั€ั…ั–ั‚ะตะบั‚ัƒั€ัƒ ะดะปั %s. ะ”ะธะฒะธััŒ apt.conf(5) APT::"
 "ะั€ั…ั–ั‚ะตะบั‚ัƒั€ะธ ะดะปั ะฝะฐะปะฐั‰ั‚ัƒะฒะฐะฝะฝั"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะพะดะตั€ะถะฐั‚ะธ ั–ะฝั„ะพั€ะผะฐั†ั–ัŽ ะฟั€ะพ ะทะฐะปะตะถะฝะพัั‚ั– ะดะปั ะฟะพะฑัƒะดะพะฒะธ %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ะฝะต ะผะฐั” ะทะฐะปะตะถะฝะพัั‚ะตะน ะดะปั ะฟะพะฑัƒะดะพะฒะธ.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -993,7 +1001,7 @@ msgstr ""
 "ะ—ะฐะปะตะถะฝั–ัั‚ัŒ ั‚ะธะฟัƒ %s ะดะปั %s ะฝะต ะผะพะถะต ะฑัƒั‚ะธ ะทะฐะดะพะฒะพะปะตะฝะฐ, ะฑะพ %s ะฝะต ั” ะดะพะทะฒะพะปะตะฝะธะผ ะฝะฐ "
 "'%s' ะฟะฐะบัƒะฝะบะฐั…"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1001,14 +1009,14 @@ msgid ""
 msgstr ""
 "ะ—ะฐะปะตะถะฝั–ัั‚ัŒ ั‚ะธะฟัƒ %s ะดะปั %s ะฝะต ะผะพะถะต ะฑัƒั‚ะธ ะทะฐะดะพะฒะพะปะตะฝะฐ, ะฑะพ ะฟะฐะบัƒะฝะพะบ %s ะฝะต ะทะฝะฐะนะดะตะฝะพ"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "ะะต ะฒะดะฐะปะพัั ะทะฐะดะพะฒะพะปัŒะฝะธั‚ะธ ะทะฐะปะตะถะฝั–ัั‚ัŒ ั‚ะธะฟัƒ %s ะดะปั %s: ะ’ัั‚ะฐะฝะพะฒะปะตะฝะธะน ะฟะฐะบัƒะฝะพะบ %s "
 "ะฝะพะฒั–ัˆะต, ะฐะฝั–ะถ ั‚ั€ะตะฑะฐ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1017,7 +1025,7 @@ msgstr ""
 "ะ—ะฐะปะตะถะฝั–ัั‚ัŒ ั‚ะธะฟัƒ %s ะดะปั %s ะฝะต ะผะพะถะต ะฑัƒั‚ะธ ะทะฐะดะพะฒะพะปะตะฝะฐ, ะฑะพ ะฒะตั€ัั–ั ะฟะฐะบัƒะฝะบัƒ-"
 "ะบะฐะฝะดะธะดะฐั‚ะฐ %s ะฝะต ะทะฐะดะพะฒะพะปัŒะฝัั” ัƒะผะพะฒะธ ะฟะพ ะฒะตั€ัั–ัะผ"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1026,30 +1034,30 @@ msgstr ""
 "ะ—ะฐะปะตะถะฝั–ัั‚ัŒ ั‚ะธะฟัƒ %s ะดะปั %s ะฝะต ะผะพะถะต ะฑัƒั‚ะธ ะทะฐะดะพะฒะพะปะตะฝะฐ, ะฑะพ ะฝะตะผะฐั” ะฟะฐะบัƒะฝะบัƒ-"
 "ะบะฐะฝะดะธะดะฐั‚ะฐ %s ะฟะพั‚ั€ั–ะฑะฝะพั— ะฒะตั€ัั–ั—"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฐะดะพะฒะพะปัŒะฝะธั‚ะธ ะทะฐะปะตะถะฝั–ัั‚ัŒ ั‚ะธะฟัƒ %s ะดะปั ะฟะฐะบัƒะฝะบะฐ %s: %s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ะ—ะฐะปะตะถะฝะพัั‚ั– ะดะปั ะฟะพะฑัƒะดะพะฒะธ %s ะฝะต ะผะพะถัƒั‚ัŒ ะฑัƒั‚ะธ ะทะฐะดะพะฒะพะปะตะฝั–."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "ะžะฑั€ะพะฑะบะฐ ะทะฐะปะตะถะฝะพัั‚ะตะน ะดะปั ะฟะพะฑัƒะดะพะฒะธ ะทะฐะบั–ะฝั‡ะธะปะฐัั ะฝะตะฒะดะฐะปะพ"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ะ–ัƒั€ะฝะฐะป ะทะผั–ะฝ ะดะปั %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ะŸั–ะดั‚ั€ะธะผัƒะฒะฐะฝั– ะผะพะดัƒะปั–:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1141,7 +1149,7 @@ msgstr ""
 "ะผั–ัั‚ัั‚ัŒ ะฑั–ะปัŒัˆะต ั–ะฝั„ะพั€ะผะฐั†ั–ั— ั– ะพะฟั†ั–ะน.\n"
 "                       ะฆะตะน APT ะผะฐั” ะกัƒะฟะตั€-ะšะพั€ะพะฒ'ัั‡ัƒ ะกะธะปัƒ.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1216,7 +1224,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ะฒะถะต ะฑัƒะฒ ะฝะตะทะฐั„ั–ะบัะพะฒะฐะฝะธะน.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ะžั‡ั–ะบัƒะฒะฐะฒ ะฝะฐ %s, ะฐะปะต ะนะพะณะพ ั‚ะฐะผ ะฝะต ะฑัƒะปะพ"
@@ -1375,8 +1384,8 @@ msgstr "ะงะฐั ะท'ั”ะดะฝะฐะฝะฝั ะฒะธั‡ะตั€ะฟะฐะฒัั"
 msgid "Server closed the connection"
 msgstr "ะกะตั€ะฒะตั€ ะทะฐะบั€ะธะฒ ะท'ั”ะดะฝะฐะฝะฝั"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "ะŸะพะผะธะปะบะฐ ะทั‡ะธั‚ัƒะฒะฐะฝะฝั"
 
@@ -1389,8 +1398,8 @@ msgid "Protocol corruption"
 msgstr "ะกะฟะพั‚ะฒะพั€ะตะฝะธะน ะฟั€ะพั‚ะพะบะพะป"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ะŸะพะผะธะปะบะฐ ะทะฐะฟะธััƒ"
 
@@ -1444,7 +1453,7 @@ msgstr "ะงะฐั ะท'ั”ะดะฝะฐะฝะฝั ะท ัะพะบะตั‚ะพะผ ะดะฐะฝะธั… ะฒะธั‡ะตั€ะฟะฐะฒั
 msgid "Unable to accept connection"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั€ะธะนะฝัั‚ะธ ะท'ั”ะดะฝะฐะฝะฝั"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ั…ะตัˆัƒะฒะฐะฝะฝั ั„ะฐะนะปะฐ"
 
@@ -1471,87 +1480,100 @@ msgstr "ะงะตั€ะณะฐ"
 msgid "Unable to invoke "
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒะธะบะปะธะบะฐั‚ะธ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ะ—'ั”ะดะฝะฐะฝะฝั ะท %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ะะตะผะพะถะปะธะฒะพ ัั‚ะฒะพั€ะธั‚ะธ ัะพะบะตั‚ ะดะปั %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟะพั‡ะฐั‚ะธ ะท'ั”ะดะฝะฐะฝะฝั ะท %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะท'ั”ะดะฝะฐั‚ะธัั ะท %s:%s (%s), ั‡ะฐั ะท'ั”ะดะฝะฐะฝะฝั ะฒะธั‡ะตั€ะฟะฐะฒัั"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั–ะด'ั”ะดะฝะฐั‚ะธัั ะดะพ %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ะ—'ั”ะดะฝะฐะฝะฝั ะท %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ะะต ะผะพะถัƒ ะทะฝะฐะนั‚ะธ IP ะฐะดั€ะตั ะดะปั %s"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ะขะธะผั‡ะฐัะพะฒะฐ ะฟะพะผะธะปะบะฐ ะฟั€ะธ ะพั‚ั€ะธะผะฐะฝะฝั– IP ะฐะดั€ะตัะธ '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "ะกั‚ะฐะปะพัั ั‰ะพััŒ ะดะธะฒะฝะต ะฟั€ะธ ัะฟั€ะพะฑั– ะพั‚ั€ะธะผะฐั‚ะธ IP ะฐะดั€ะตั ะดะปั '%s:%s' (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ะกั‚ะฐะปะพัั ั‰ะพััŒ ะดะธะฒะฝะต ะฟั€ะธ ัะฟั€ะพะฑั– ะพั‚ั€ะธะผะฐั‚ะธ IP ะฐะดั€ะตั ะดะปั '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั–ะด'ั”ะดะฝะฐั‚ะธัั ะดะพ %s:%s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ะ’ะฝัƒั‚ั€ั–ัˆะฝั ะฟะพะผะธะปะบะฐ: ะ’ั–ั€ะฝะธะน ะฟั–ะดะฟะธั (signature), ะฐะปะต ะฝะต ะผะพะถะปะธะฒะพ ะฒะธะทะฝะฐั‡ะธั‚ะธ ะนะพะณะพ "
 "ะฒั–ะดะฑะธั‚ะพะบ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "ะ—ะฝะฐะนะดะตะฝะพ ัะบ ะผั–ะฝั–ะผัƒะผ ะพะดะธะฝ ะฝะตะฒั–ั€ะฝะธะน ะฟั–ะดะฟะธั."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒะธะบะพะฝะฐั‚ะธ 'gpgv' ะดะปั ะฟะตั€ะตะฒั–ั€ะบะธ ะฟั–ะดะฟะธััƒ (ั‡ะธ ะฒัั‚ะฐะฝะพะฒะปะตะฝะพ gpgv?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "ะะตะฒั–ะดะพะผะฐ ะฟะพะผะธะปะบะฐ ะฒะธะบะพะฝะฐะฝะฝั gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ะะฐัั‚ัƒะฟะฝั– ะฟั–ะดะฟะธัะธ ะฑัƒะปะธ ะฝะตะฒั–ั€ะฝะธะผะธ:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1591,53 +1613,53 @@ msgstr "ะฆะตะน HTTP ัะตั€ะฒะตั€ ะผะฐั” ะฟะพะปะฐะผะฐะฝัƒ ะฟั–ะดั‚ั€ะธะผะบัƒ 'ran
 msgid "Unknown date format"
 msgstr "ะะตะฒั–ะดะพะผะธะน ั„ะพั€ะผะฐั‚ ะดะฐั‚ะธ"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "ะ’ะธะฑั–ั€ ะฟั€ะพะฒะฐะปะธะฒัั"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "ะงะฐั ะพั‡ั–ะบัƒะฒะฐะฝะฝั ะท'ั”ะดะฝะฐะฝะฝั ะฒะธะนัˆะพะฒ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ะŸะพะผะธะปะบะฐ ะทะฐะฟะธััƒ ัƒ ะฒะธั…ั–ะดะฝะธะน ั„ะฐะนะป"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ะŸะพะผะธะปะบะฐ ะทะฐะฟะธััƒ ัƒ ั„ะฐะนะป"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ะŸะพะผะธะปะบะฐ ะทะฐะฟะธััƒ ัƒ ั„ะฐะนะป"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ะŸะพะผะธะปะบะฐ ะทั‡ะธั‚ัƒะฒะฐะฝะฝั ะท ัะตั€ะฒะตั€ะฐ. ะ’ั–ะดะดะฐะปะตะฝะฐ ัั‚ะพั€ะพะฝะฐ ะทะฐะบั€ะธะปะฐ ะท'ั”ะดะฝะฐะฝะฝั"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ะŸะพะผะธะปะบะฐ ะทั‡ะธั‚ัƒะฒะฐะฝะฝั ะท ัะตั€ะฒะตั€ะฐ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "ะŸะพะณะฐะฝะฐ ะทะฐะณะพะปะพะฒะบะพะฒะฐ ั–ะฝั„ะพั€ะผะฐั†ั–ั"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "ะ—'ั”ะดะฝะฐะฝะฝั ะฝะต ะฒะดะฐะปะพัั"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ะ’ะฝัƒั‚ั€ั–ัˆะฝั ะฟะพะผะธะปะบะฐ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั€ะพั‡ะธั‚ะฐั‚ะธ %s"
@@ -1664,7 +1686,12 @@ msgstr "ะะต ะทะฝะฐะนะดะตะฝะพ ั„ะฐะนะปะฐ ะดะทะตั€ะบะฐะปะฐ '%s' "
 msgid "Can not read mirror file '%s'"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ั„ะฐะนะป ะดะทะตั€ะบะฐะปะฐ '%s'"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ั„ะฐะนะป ะดะทะตั€ะบะฐะปะฐ '%s'"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[ะ”ะทะตั€ะบะฐะปะพ: %s]"
@@ -1763,7 +1790,7 @@ msgstr ""
 "  -c=? ะงะธั‚ะฐั‚ะธ ะทะฐะทะฝะฐั‡ะตะฝะธะน ะบะพะฝั„ั–ะณัƒั€ะฐั†ั–ะนะฝะธะน ั„ะฐะนะป\n"
 "  -o=? ะ’ะบะฐะทะฐั‚ะธ ะดะพะฒั–ะปัŒะฝัƒ ะพะฟั†ั–ัŽ, ะฝะฐะฟั€ะธะบะปะฐะด, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฐะฟะธัะฐั‚ะธ ะฒ %s"
@@ -1918,8 +1945,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒั–ะดะบั€ะธั‚ะธ ั„ะฐะนะป ะ‘ะ” %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะพะดะตั€ะถะฐั‚ะธ ะฐั‚ั€ะธะฑัƒั‚ะธ %s"
@@ -1932,87 +1959,87 @@ msgstr "ะ’ ะฐั€ั…ั–ะฒั– ะฝะตะผะฐั” ะทะฐะฟะธััƒ 'control'"
 msgid "Unable to get a cursor"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะพะดะตั€ะถะฐั‚ะธ ะบัƒั€ัะพั€"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "ะฃ: ะะต ะฒะดะฐะปะพัั ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ะดะธั€ะตะบั‚ะพั€ั–ัŽ %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "ะฃ: ะะตะผะพะถะปะธะฒะพ ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ะฐั‚ั€ะธะฑัƒั‚ะธ %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "ะŸ: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "ะฃ: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "ะŸ: ะŸะพะผะธะปะบะธ ะฒั–ะดะฝะพััั‚ัŒัั ะดะพ ั„ะฐะนะปัƒ "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒะธะทะฝะฐั‡ะธั‚ะธ %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ะะต ะฒะดะฐะปะพัั ะทั€ะพะฑะธั‚ะธ ะพะฑั…ั–ะด ะดะตั€ะตะฒะฐ"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒั–ะดะบั€ะธั‚ะธ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ะฟะพัะธะปะฐะฝะฝั (readlink) %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒะธะดะฐะปะธั‚ะธ ะฟะพัะธะปะฐะฝะฝั (unlink) %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ะะต ะฒะดะฐะปะพัั ัั‚ะฒะพั€ะธั‚ะธ ะฟะพัะธะปะฐะฝะฝั %s ะฝะฐ %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ะŸะตั€ะตะฒะธั‰ะตะฝะพ ะปั–ะผั–ั‚ ะฒ %sB ะฒ DeLink.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ะั€ั…ั–ะฒ ะฝะต ะผะฐะฒ ะฟะพะปั 'package'"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, fuzzy, c-format
 msgid "  %s has no override entry\n"
 msgstr "  ะ’ั–ะดััƒั‚ะฝั–ะน ะทะฐะฟะธั ะฟั€ะพ ะฟะตั€ะตะฟั€ะธะทะฝะฐั‡ะตะฝะฝั (override) ะดะปั %s\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ะฟะฐะบัƒะฝะพะบ %s ััƒะฟั€ะพะฒะพะดะถัƒั”ั‚ัŒัั %s, ะฐ ะฝะต %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  ะ’ั–ะดััƒั‚ะฝั–ะน ะทะฐะฟะธั ะฟั€ะพ ะฟะตั€ะตะฟั€ะธะทะฝะฐั‡ะตะฝะฝั ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ ะดะปั %s\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  ะšั€ั–ะผ ั‚ะพะณะพ, ะฒั–ะดััƒั‚ะฝั–ะน ะทะฐะฟะธั ะฟั€ะพ ะฑั–ะฝะฐั€ะฝะต ะฟะตั€ะตะฟั€ะธะทะฝะฐั‡ะตะฝะฝั ะดะปั %s\n"
@@ -2086,7 +2113,7 @@ msgstr "ะŸะพะผะธะปะบะฐ ะทั‡ะธั‚ัƒะฒะฐะฝะฝั ะฟั–ะด ั‡ะฐั ะพะฑั‡ะธัะปะตะฝะฝั M
 msgid "Problem unlinking %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒะธะดะฐะปะธั‚ะธ %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฟะตั€ะตะนะผะตะฝัƒะฒะฐั‚ะธ %s ะฝะฐ %s"
@@ -2146,23 +2173,23 @@ msgstr ""
 "  -c=? ั‡ะธั‚ะฐั‚ะธ ะทะฐะทะฝะฐั‡ะตะฝะธะน ั„ะฐะนะป ะบะพะฝั„ั–ะณัƒั€ะฐั†ั–ั—\n"
 "  -o=? ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะดะพะฒั–ะปัŒะฝัƒ ะพะฟั†ั–ัŽ, ะฝะฐะฟั€ะธะบะปะฐะด, -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ะะต ะฒะดะฐะปะพัั ัั‚ะฒะพั€ะธั‚ะธ ะบะฐะฝะฐะปะธ (pipes)"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒะธะบะพะฝะฐั‚ะธ gzip "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ะŸะพัˆะบะพะดะถะตะฝะธะน ะฐั€ั…ั–ะฒ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ะšะพะฝั‚ั€ะพะปัŒะฝะฐ ััƒะผะฐ tar ะฐั€ั…ั–ะฒะฐ ะฝะตะฒั–ั€ะฝะฐ, ะฐั€ั…ั–ะฒ ะฟะพัˆะบะพะดะถะตะฝะธะน"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ะะตะฒั–ะดะพะผะธะน ั‚ะธะฟ ะทะฐะณะพะปะพะฒะบัƒ TAR - %u, ั‡ะปะตะฝ %s"
@@ -2235,56 +2262,56 @@ msgstr "ะะต ะฒะดะฐะปะพัั ะทะฐะฟะธัะฐั‚ะธ ั„ะฐะนะป %s"
 msgid "Failed to close file %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะทะฐะบั€ะธั‚ะธ ั„ะฐะนะป %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ะจะปัั… %s ะทะฐะฝะฐะดั‚ะพ ะดะพะฒะณะธะน"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "ะ ะพะทะฟะฐะบัƒะฒะฐะฝะฝั %s ะฑั–ะปัŒัˆ ะฝั–ะถ ะพะดะธะฝ ั€ะฐะท"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, fuzzy, c-format
 msgid "The directory %s is diverted"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ั–ั %s ั” ะฒั–ะดั…ะธะปะตะฝะพัŽ (diverted)"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ะŸะฐะบัƒะฝะพะบ ะฟั€ะพะฑัƒั” ะทะฐะฟะธัะฐั‚ะธ ัƒ ั†ั–ะปัŒ ะท diversion %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 #, fuzzy
 msgid "The diversion path is too long"
 msgstr "ะจะปัั… 'diversion' ั” ะทะฐะฝะฐะดั‚ะพ ะดะพะฒะณะธะผ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ั–ั %s ะทะฐะผั–ะฝัŽั”ั‚ัŒัั ะฝะต ะดะธั€ะตะบั‚ะพั€ั–ั”ัŽ"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 #, fuzzy
 msgid "Failed to locate node in its hash bucket"
 msgstr "ะะต ะฒะดะฐะปะพัั ะทะฝะฐะนั‚ะธ ะฒัƒะทะพะป ัƒ ะนะพะณะพ ะฝะฐะฑะพั€ั– ั…ะตัˆั–ะฒ"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ะจะปัั… ะทะฐะฝะฐะดั‚ะพ ะดะพะฒะณะธะน"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "ะŸะตั€ะตะทะฐะฟะธัะฐั‚ะธ ะฒั–ะดะฟะพะฒั–ะดะฝั–ัั‚ัŒ ะฟะฐะบัƒะฝะบะฐ ะฑะตะท ะฒะตั€ัั–ั— ะดะปั %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ะคะฐะนะป %s/%s ะฟะตั€ะตะทะฐะฟะธััƒั” ั–ะฝัˆะธะน ั„ะฐะนะป ะฒ ะฟะฐะบัƒะฝะบัƒ %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ะฐั‚ั€ะธะฑัƒั‚ะธ %s"
@@ -2365,30 +2392,30 @@ msgstr ""
 "ะบะพั€ะธัั‚ัƒะฒะฐั‡ะตะผ."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liะด %liะณ %liั…ะฒ %liั"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liะณ %liั…ะฒ %liั"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liั…ะฒ %liั"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%liั"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "ะ’ะธะฑั–ั€ %s ะฝะต ะทะฝะฐะนะดะตะฝะพ"
@@ -2462,6 +2489,16 @@ msgstr "%c%s... ะŸะพะผะธะปะบะฐ!"
 msgid "%c%s... Done"
 msgstr "%c%s... ะ’ะธะบะพะฝะฐะฝะพ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ะ’ะธะบะพะฝะฐะฝะพ"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2523,119 +2560,125 @@ msgstr "ะะต ะฒะดะฐะปะพัั ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ะฐั‚ั€ะธะฑัƒั‚ะธ cdrom"
 msgid "Problem closing the gzip file %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะท ะทะฐะบั€ะธั‚ั‚ัะผ gzip ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "ะ‘ะปะพะบัƒะฒะฐะฝะฝั ะฝะต ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั, ั‚ะฐะบ ัะบ ั„ะฐะนะป ะฑะปะพะบัƒะฒะฐะฝะฝั %s ะดะพัั‚ัƒะฟะฝะธะน ั‚ั–ะปัŒะบะธ "
 "ะดะปั ะทั‡ะธั‚ัƒะฒะฐะฝะฝั"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒั–ะดะบั€ะธั‚ะธ 'lock' ั„ะฐะนะป %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ะ‘ะปะพะบัƒะฒะฐะฝะฝั ะฝะต ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั, ั‚ะฐะบ ัะบ ั„ะฐะนะป ะฑะปะพะบัƒะฒะฐะฝะฝั %s ะทะฝะฐั…ะพะดะธั‚ัŒัั ะฝะฐ "
 "ั„ะฐะนะปะพะฒั–ะน ัะธัั‚ะตะผั– nfs"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะพั‚ั€ะธะผะฐั‚ะธ ะทะฐะผะพะบ %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "ะะตะผะพะถะปะธะฒะพ ัั‚ะฒะพั€ะธั‚ะธ ะฟะตั€ะตะปั–ะบ ั„ะฐะนะปั–ะฒ, ั‚ะฐะบ ัะบ '%s' ะฝะต ั” ะดะธั€ะตะบั‚ะพั€ั–ั”ัŽ"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "ะ†ะณะฝะพั€ัƒั”ั‚ัŒัั '%s' ัƒ ะดะธั€ะตะบั‚ะพั€ั–ั— '%s', ั‚ะฐะบ ัะบ ะฝะต ั” ะทะฒะธั‡ะฐะนะฝะธะผ ั„ะฐะนะปะพะผ"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "ะ†ะณะฝะพั€ัƒั”ั‚ัŒัั ั„ะฐะนะป '%s' ัƒ ะดะธั€ะตะบั‚ะพั€ั–ั— '%s', ั‚ะฐะบ ัะบ ะฒั–ะฝ ะฝะต ะผะฐั” ั€ะพะทัˆะธั€ะตะฝะฝั"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "ะ†ะณะฝะพั€ัƒั”ั‚ัŒัั ั„ะฐะนะป '%s' ัƒ ะดะธั€ะตะบั‚ะพั€ั–ั— '%s', ั‚ะฐะบ ัะบ ะฒั–ะฝ ะผะฐั” ะฝะตะฒั–ั€ะฝะต ั€ะพะทัˆะธั€ะตะฝะฝั"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ะŸั–ะดะฟั€ะพั†ะตั %s ะพั‚ั€ะธะผะฐะฒ 'segmentation fault' (ั„ะฐั‚ะฐะปัŒะฝะฐ ะฟะพะผะธะปะบะฐ)."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ะŸั–ะดะฟั€ะพั†ะตั %s ะพั‚ั€ะธะผะฐะฒ ัะธะณะฝะฐะป %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ะŸั–ะดะฟั€ะพั†ะตั %s ะฟะพะฒะตั€ะฝัƒะฒ ะบะพะด ะฟะพะผะธะปะบะธ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ะŸั–ะดะฟั€ะพั†ะตั %s ั€ะฐะฟั‚ะพะฒะพ ะทะฐะฒะตั€ัˆะธะฒัั"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒั–ะดะบั€ะธั‚ะธ ั„ะฐะนะป %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒั–ะดะบั€ะธั‚ะธ ั„ะฐะนะปะพะฒะธะน ะดะตัะบั€ะธะฟั‚ะพั€ %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ะะต ะฒะดะฐะปะพัั ัั‚ะฒะพั€ะธั‚ะธ IPC ะท ะฟะพั€ะพะดะถะตะฝะธะผ ะฟั€ะพั†ะตัะพะผ"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "ะะต ะฒะดะฐะปะพัั ะฒะธะบะพะฝะฐั‚ะธ ะบะพะผะฟั€ะตัะพั€ "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "ะทั‡ะธั‚ัƒะฒะฐะฝะฝั, ะฟะพะฒะธะฝะตะฝ ะทั‡ะธั‚ะฐั‚ะธ ั‰ะต %llu ะฑะฐะนั‚, ะฐะปะต ะฝั–ั‡ะพะณะพ ะฑั–ะปัŒัˆะต ะฝะตะผะฐ"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ะทะฐะฟะธััƒะฒะฐะฝะฝั, ะฟะพะฒะธะฝะตะฝ ะฑัƒะฒ ะทะฐะฟะธัะฐั‚ะธ ั‰ะต %llu ะฑะฐะนั‚, ะฐะปะต ะฝะต ะฒะดะฐะปะพัั"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะท ะทะฐะบั€ะธั‚ั‚ัะผ ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะท ะฟะตั€ะตะนะผะตะฝัƒะฒะฐะฝะฝัะผ ั„ะฐะนะปะฐ %s ะฝะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะท ั€ะพะท'ั”ะดะฝะฐะฝะฝัะผ ั„ะฐะนะปะฐ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ะŸั€ะพะฑะปะตะผะฐ ะท ัะธะฝั…ั€ะพะฝั–ะทะฐั†ั–ั”ัŽ ั„ะฐะนะปะฐ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ะะต ะฒัั‚ะฐะฝะพะฒะปะตะฝะพ 'keyring' ัƒ %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ะšะตัˆ ะฟะฐะบัƒะฝะบั–ะฒ ะฟัƒัั‚ะธะน"
@@ -2661,59 +2704,59 @@ msgstr "ะฆะตะน APT ะฝะต ะฟั–ะดั‚ั€ะธะผัƒั” ัะธัั‚ะตะผัƒ ะฟั€ะธะทะฝะฐั‡ะตะฝะฝั
 msgid "The package cache was built for a different architecture"
 msgstr "ะšะตัˆ ะฟะฐะบัƒะฝะบั–ะฒ ะฑัƒะฒ ะฟะพะฑัƒะดะพะฒะฐะฝะธะน ะดะปั ั–ะฝัˆะพั— ะฐั€ั…ั–ั‚ะตะบั‚ัƒั€ะธ"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ะ—ะฐะปะตะถะฝะพัั‚ั– (Depends)"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "ะŸั€ะต-ะ—ะฐะปะตะถะฝะพัั‚ั– (PreDepends)"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ะŸั€ะพะฟะพะฝัƒั” (Suggests)"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ะ ะตะบะพะผะตะฝะดัƒั” (Recommends)"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "ะšะพะฝั„ะปั–ะบั‚ะธ (Conflicts)"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ะ—ะฐะผั–ะฝัั” (Replaces)"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ะ—ะฐัั‚ะฐั€ั–ะปั– (Obsoletes)"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ะ›ะฐะผะฐั” (Breaks)"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "ะŸะพะบั€ะฐั‰ัƒั” (Enhances)"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "ะฒะฐะถะปะธะฒั– (important)"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ะฝะตะพะฑั…ั–ะดะฝั– (required)"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ัั‚ะฐะฝะดะฐั€ั‚ะฝั– (standard)"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ะฝะตะพะฑะพะฒ'ัะทะบะพะฒั– (optional)"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "ะดะพะดะฐั‚ะบะพะฒั– (extra)"
 
@@ -2815,17 +2858,17 @@ msgstr "ะ’ั–ะดะบั€ะธั‚ั‚ั %s"
 msgid "Line %u too long in source list %s."
 msgstr "ะ ัะดะพะบ %u ั” ะทะฐะฝะฐะดั‚ะพ ะดะพะฒะณะธะผ ัƒ ะฟะตั€ะตะปั–ะบัƒ ะดะถะตั€ะตะป %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ะกะฟะพั‚ะฒะพั€ะตะฝะธะน ั€ัะดะพะบ %u ัƒ ะฟะตั€ะตะปั–ะบัƒ ะดะถะตั€ะตะป %s (ั‚ะธะฟ)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ะะตะฒั–ะดะพะผะธะน ั‚ะธะฟ '%s' ะฝะฐ ั€ัะดะบัƒ %u ะฒ ะฟะตั€ะตะปั–ะบัƒ ะดะถะตั€ะตะป %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2834,12 +2877,12 @@ msgstr ""
 "ะะตะผะพะถะปะธะฒะพ ะฟั€ัะผะพ ะฝะฐะปะฐัˆั‚ัƒะฒะฐั‚ะธ ะบะพะฝั„ั–ะณัƒั€ะฐั†ั–ัŽ ะฝะฐ '%s'. ะ‘ัƒะดัŒ-ะปะฐัะบะฐ, ะดะธะฒั–ั‚ัŒัั man 5 "
 "apt.conf, ะฝะธะถั‡ะต APT::Immediate-Configure ะดะปั ะดะตั‚ะฐะปะตะน. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฝะฐะปะฐัˆั‚ัƒะฒะฐั‚ะธ '%s'."
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2863,7 +2906,7 @@ msgid ""
 msgstr ""
 "ะŸะฐะบัƒะฝะพะบ %s ะฟะพะฒะธะฝะตะฝ ะฑัƒั‚ะธ ะฟะตั€ะตะฒัั‚ะฐะฝะพะฒะปะตะฝะธะผ, ะฐะปะต ั ะฝะต ะผะพะถัƒ ะทะฝะฐะนั‚ะธ ะนะพะณะพ ะฐั€ั…ั–ะฒ."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2871,11 +2914,11 @@ msgstr ""
 "ะŸะพะผะธะปะบะฐ, pkgProblemResolver::Resolve ะทะณะตะฝะตั€ัƒะฒะฐะฒ ะทัƒะฟะธะฝะบัƒ, ั†ะต ะผะพะถะต ะฑัƒั‚ะธ "
 "ะฟะพะฒ'ัะทะฐะฝะพ ะท ะทะฐั„ั–ะบัะพะฒะฐะฝะธะผะธ ะฟะฐะบัƒะฝะบะฐะผะธ."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ะะตะผะพะถะปะธะฒะพ ัƒััƒะฝัƒั‚ะธ ะฟั€ะพะฑะปะตะผะธ, ะฒะธ ะผะฐั”ั‚ะต ะฟะพะปะฐะผะฐะฝั– ะทะฐั„ั–ะบัะพะฒะฐะฝั– ะฟะฐะบัƒะฝะบะธ."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2883,7 +2926,7 @@ msgstr ""
 "ะ”ะตัะบั– ั–ะฝะดะตะบัะฝั– ั„ะฐะนะปะธ ะฝะต ะฒะดะฐะปะพัั ะทะฐะฒะฐะฝั‚ะฐะถะธั‚ะธ. ะ’ะพะฝะธ ะฑัƒะปะธ ะทั–ะณะฝะพั€ะพะฒะฐะฝั–, ะฐะฑะพ "
 "ะทะฐะผั–ัั‚ัŒ ะฝะธั… ะฑัƒะปะธ ะฒะธะบะพั€ะธัั‚ะฐะฝั– ัั‚ะฐั€ั–ัˆั– ะฒะตั€ัั–ั—."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "ะ’ั–ะดััƒั‚ะฝั ะดะธั€ะตะบั‚ะพั€ั–ั ะทั– ัะฟะธัะบะฐะผะธ: %spartial"
@@ -2920,18 +2963,18 @@ msgstr "ะ”ั€ะฐะนะฒะตั€ ะดะปั ะผะตั‚ะพะดะฐ %s ะฝะต ะทะฝะฐะนะดะตะฝะพ."
 msgid "Method %s did not start correctly"
 msgstr "ะœะตั‚ะพะด %s ัั‚ะฐั€ั‚ัƒะฒะฐะฒ ะฝะตะบะพั€ะตะบั‚ะฝะพ"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "ะ‘ัƒะดัŒ-ะปะฐัะบะฐ, ะฒัั‚ะฐะฒั‚ะต ะดะธัะบ ะท ะฟะพะผั–ั‚ะบะพัŽ: '%s' ะฒ ะฟั€ะธะฒั–ะด '%s' ั– ะฝะฐั‚ะธัะฝั–ั‚ัŒ Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ะกะธัั‚ะตะผะฐ ะฟะฐะบัƒะฒะฐะฝะฝั '%s' ะฝะต ะฟั–ะดั‚ั€ะธะผัƒั”ั‚ัŒัั"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒะธะทะฝะฐั‡ะธั‚ะธ ั‚ะธะฟ ะฝะตะพะฑั…ั–ะดะฝะพั— ัะธัั‚ะตะผะธ ะฟะฐะบัƒะฒะฐะฝะฝั"
 
@@ -2986,14 +3029,14 @@ msgstr "ะšะตัˆ ะผะฐั” ะฝะตััƒะผั–ัะฝัƒ ัะธัั‚ะตะผัƒ ะฟั€ะธะทะฝะฐั‡ะตะฝะฝั ะ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ะ’ะธะฝะธะบะปะฐ ะฟะพะผะธะปะบะฐ ะฟั–ะด ั‡ะฐั ะพะฑั€ะพะฑะบะธ %s (%s%d)"
@@ -3014,27 +3057,27 @@ msgstr "ะžะณะพ! ะ’ะธ ะฟะตั€ะตะฒะธั‰ะธะปะธ ะบั–ะปัŒะบั–ัั‚ัŒ ะพะฟะธัั–ะฒ, ัะบั
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "ะžะณะพ! ะ’ะธ ะฟะตั€ะตะฒะธั‰ะธะปะธ ะบั–ะปัŒะบั–ัั‚ัŒ ะทะฐะปะตะถะฝะพัั‚ะตะน, ัะบั– APT ะผะพะถะต ะพะฑั€ะพะฑะธั‚ะธ."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ะŸะฐะบัƒะฝะพะบ %s %s ะฝะต ะฑัƒะฒ ะทะฝะฐะนะดะตะฝะธะน ะฟั–ะด ั‡ะฐั ะพะฑั€ะพะฑะบะธ ะทะฐะปะตะถะฝะพัั‚ะตะน"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ะะต ะฒะดะฐะปะพัั ะฟั€ะพั‡ะธั‚ะฐั‚ะธ ะฐั‚ั€ะธะฑัƒั‚ะธ ะฟะตั€ะตะปั–ะบัƒ ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ะ—ั‡ะธั‚ัƒะฒะฐะฝะฝั ะฟะตั€ะตะปั–ะบั–ะฒ ะฟะฐะบัƒะฝะบั–ะฒ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 #, fuzzy
 msgid "Collecting File Provides"
 msgstr "ะ—ะฑะธั€ะฐะฝะฝั ั–ะฝั„ะพั€ะผะฐั†ั–ั— ะฟั€ะพ 'File Provides'"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ะŸะพะผะธะปะบะฐ IO ะฟั–ะด ั‡ะฐั ะทะฑะตั€ะตะถะตะฝะฝั ะบะตัˆัƒ ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ"
 
@@ -3047,12 +3090,12 @@ msgstr "ะฝะต ะฒะดะฐะปะพัั ะฟะตั€ะตะนะผะตะฝัƒะฒะฐั‚ะธ, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "ะะตะฒั–ะดะฟะพะฒั–ะดะฝั–ัั‚ัŒ MD5Sum"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "ะะตะฒั–ะดะฟะพะฒั–ะดะฝั–ัั‚ัŒ ั…ะตัˆัƒ MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3061,16 +3104,16 @@ msgstr ""
 "ะะตะผะพะถะปะธะฒะพ ะทะฝะฐะนั‚ะธ ะพั‡ั–ะบัƒะฒะฐะฝะธะน ะทะฐะฟะธั '%s' ัƒ 'Release' ั„ะฐะนะปั– (ะะตะฒั–ั€ะฝะธะน ะทะฐะฟะธั ัƒ "
 "sources.list, ะฐะฑะพ ะฟะพัˆะบะพะดะถะตะฝะธะน ั„ะฐะนะป)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฝะฐะนั‚ะธ ั…ะตัˆ-ััƒะผัƒ ะดะปั '%s' ัƒ 'Release' ั„ะฐะนะปั–"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ะ’ั–ะดััƒั‚ะฝั–ะน ะฟัƒะฑะปั–ั‡ะฝะธะน ะบะปัŽั‡ ะดะปั ะทะฐะดะฐะฝะธั… ั–ะดะตะฝั‚ะธั„ั–ะบะฐั‚ะพั€ั–ะฒ (ID) ะบะปัŽั‡ะฐ:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3079,27 +3122,27 @@ msgstr ""
 "ะคะฐะนะป 'Release' ะดะปั %s ะทะฐัั‚ะฐั€ั–ะฒ (ะฝะตะดั–ะนัะฝะธะน ะท %s). ะžะฝะพะฒะปะตะฝะฝั ะดะปั ั†ัŒะพะณะพ "
 "ั€ะตะฟะพะทะธั‚ะพั€ั–ั ะฝะต ะฑัƒะดัƒั‚ัŒ ะทะฐัั‚ะพัะพะฒะฐะฝั–."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ะšะพะฝั„ะปั–ะบั‚ัƒัŽั‡ะธะน ะดะธัั‚ั€ะธะฑัƒั‚ะธะฒ: %s (ะพั‡ั–ะบัƒะฒะฐะฒัั %s, ะฐะปะต ั” %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "ะ’ะธะฝะธะบะปะฐ ะฟะพะผะธะปะบะฐ ะฟั–ะด ั‡ะฐั ะฟะตั€ะตะฒั–ั€ะบะธ ะฟั–ะดะฟะธััƒ. ะ ะตะฟะพะทะธั‚ะพั€ั–ะน ะฝะต ะพะฝะพะฒะปะตะฝะพ, "
 "ะฟะพะฟะตั€ะตะดะฝั– ั–ะฝะดะตะบัะฝั– ั„ะฐะนะปะธ ะฑัƒะดัƒั‚ัŒ ะฒะธะบะพั€ะธัั‚ะฐะฝั–. ะŸะพะผะธะปะบะฐ GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ะŸะพะผะธะปะบะฐ GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3108,7 +3151,7 @@ msgstr ""
 "ะฏ ะฝะต ะทะผั–ะณ ะทะฝะฐะนั‚ะธ ั„ะฐะนะป ะดะปั ะฟะฐะบัƒะฝะบัƒ %s. ะœะพะถะปะธะฒะพ, ั†ะต ะทะฝะฐั‡ะธั‚ัŒ, ั‰ะพ ะฒะฐะผ ะฟะพั‚ั€ั–ะฑะฝะพ "
 "ะฒะปะฐัะฝะพั€ัƒั‡ ะฒะธะฟั€ะฐะฒะธั‚ะธ ั†ะตะน ะฟะฐะบัƒะฝะพะบ. (ั‡ะตั€ะตะท ะฒั–ะดััƒั‚ะฝั–ัั‚ัŒ 'arch')"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3117,38 +3160,38 @@ msgstr ""
 "ะฏ ะฝะต ะทะผั–ะณ ะทะฝะฐะนั‚ะธ ั„ะฐะนะป ะดะปั ะฟะฐะบัƒะฝะบัƒ %s. ะœะพะถะปะธะฒะพ, ั†ะต ะทะฝะฐั‡ะธั‚ัŒ, ั‰ะพ ะฒะฐะผ ะฟะพั‚ั€ั–ะฑะฝะพ "
 "ะฒะปะฐัะฝะพั€ัƒั‡ ะฒะธะฟั€ะฐะฒะธั‚ะธ ั†ะตะน ะฟะฐะบัƒะฝะพะบ."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ะ†ะฝะดะตะบัะฝั– ั„ะฐะนะปะธ ะฟะฐะบัƒะฝะบั–ะฒ ะฟะพัˆะบะพะดะถะตะฝั–. ะะตะผะฐั” ะฟะพะปั 'Filename' ะดะปั ะฟะฐะบัƒะฝะบัƒ %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ะะตะฒั–ะดะฟะพะฒั–ะดะฝั–ัั‚ัŒ ั€ะพะทะผั–ั€ัƒ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฟั€ะพะฐะฝะฐะปั–ะทัƒะฒะฐั‚ะธ 'Release' ั„ะฐะนะป %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "ะะตะผะฐั” ัะตะบั†ั–ะน ัƒ 'Release' ั„ะฐะนะปั– %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "ะะตะผะฐั” ะทะฐะฟะธััƒ 'Hash' ัƒ 'Release' ั„ะฐะนะปั– %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ะะตะฒั–ั€ะฝะธะน ะทะฐะฟะธั 'Valid-Until' ัƒ 'Release' ั„ะฐะนะปั– %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ะะตะฒั–ั€ะฝะธะน ะทะฐะฟะธั 'Date' ัƒ 'Release' ั„ะฐะนะปั– %s"
@@ -3176,7 +3219,7 @@ msgstr "ะ†ะดะตะฝั‚ะธั„ั–ะบะฐั†ั–ั.. "
 msgid "Stored label: %s\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะพ ะผั–ั‚ะบัƒ: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ะ”ะตะผะพะฝั‚ัƒั”ั‚ัŒัั CD-ROM...\n"
 
@@ -3240,30 +3283,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ะšะพะฟั–ัŽัŽั‚ัŒัั ะฟะตั€ะตะปั–ะบะธ ะฟะฐะบัƒะฝะบั–ะฒ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ะ—ะฐะฟะธััƒั”ั‚ัŒัั ะฝะพะฒะธะน ะฟะตั€ะตะปั–ะบ ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ะŸะตั€ะตะปั–ะบ ะฒะธั…ั–ะดะฝะธั… ั‚ะตะบัั‚ั–ะฒ ะดะปั ั†ัŒะพะณะพ ะดะธัะบะฐ:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะพ %i ะทะฐะฟะธัั–ะฒ.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะพ %i ะทะฐะฟะธัั–ะฒ ะท %i ะฒั–ะดััƒั‚ะฝั–ะผะธ ั„ะฐะนะปะฐะผะธ.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะพ %i ะทะฐะฟะธัั–ะฒ ะท %i ะฝะตะฒั–ะดะฟะพะฒั–ะดะฝะธะผะธ ั„ะฐะนะปะฐะผ\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "ะ—ะฐะฟะธัะฐะฝะพ %i ะทะฐะฟะธัั–ะฒ ะท %i ะฒั–ะดััƒั‚ะฝั–ะผะธ ั– %i ะฝะตะฒั–ะดะฟะพะฒั–ะดะฝะธะผะธ ั„ะฐะนะปะฐะผะธ\n"
@@ -3278,17 +3321,6 @@ msgstr "ะะตะผะพะถะปะธะฒะพ ะทะฝะฐะนั‚ะธ ะฐัƒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ะนะฝะธะน ะทะฐะ
 msgid "Hash mismatch for: %s"
 msgstr "ะะตะฒั–ะดะฟะพะฒั–ะดะฝั–ัั‚ัŒ ั…ะตัˆัƒ ะดะปั: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "ะคะฐะนะป %s ะฟะพั‡ะธะฝะฐั”ั‚ัŒัั ะท ะฝะต 'clearsigned' ะฟะพะฒั–ะดะพะผะปะตะฝะฝัะผ"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ะะต ะฒัั‚ะฐะฝะพะฒะปะตะฝะพ 'keyring' ัƒ %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3363,117 +3395,117 @@ msgstr ""
 "ะ—ะพะฒะฝั–ัˆะฝั–ะน ั€ะพะทะฒ'ัะทัƒะฒะฐั‡ ะทะฐะฒะตั€ัˆะธะฒัั ะฝะตะฒะดะฐะปะพ ะฑะตะท ะฒั–ะดะฟะพะฒั–ะดะฝะพะณะพ ะฟะพะฒั–ะดะพะผะปะตะฝะฝั ะฟั€ะพ "
 "ะฟะพะผะธะปะบัƒ"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 #, fuzzy
 msgid "Execute external solver"
 msgstr "ะ’ะธะบะพะฝะฐั‚ะธ ะทะพะฒะฝั–ัˆะฝั–ะน ั€ะพะทะฒ'ัะทัƒะฒะฐั‡"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ะ’ัั‚ะฐะฝะพะฒะปัŽั”ั‚ัŒัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ะะฐะปะฐัˆั‚ะพะฒัƒั”ั‚ัŒัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ะ’ะธะดะฐะปัั”ั‚ัŒัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "ะŸะพะฒะฝั–ัั‚ัŽ ะฒะธะดะฐะปัั”ั‚ัŒัั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "ะ’ะทัั‚ะพ ะดะพ ะฒั–ะดะพะผะฐ ะทะฝะธะบะฝะตะฝะฝั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ะ’ะธะบะพะฝัƒั”ั‚ัŒัั ะฟั–ัะปััƒัั‚ะฐะฝะพะฒะพั‡ะฝะธะน ั–ะฝั–ั†ั–ะฐั‚ะพั€ %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ะ”ะธั€ะตะบั‚ะพั€ั–ั '%s' ะฒั–ะดััƒั‚ะฝั"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ะะตะผะพะถะปะธะฒะพ ะฒั–ะดะบั€ะธั‚ะธ ั„ะฐะนะป '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ะŸั–ะดะณะพั‚ะพะฒะบะฐ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ะ ะพะทะฟะฐะบัƒะฒะฐะฝะฝั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ะŸั–ะดะณะพั‚ะพะฒะบะฐ ะดะพ ะบะพะฝั„ั–ะณัƒั€ะฐั†ั–ั— %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ะ’ัั‚ะฐะฝะพะฒะปะตะฝะพ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ะŸั–ะดะณะพั‚ะพะฒะบะฐ ะดะพ ะฒะธะดะฐะปะตะฝะฝั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ะ’ะธะดะฐะปะตะฝะพ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ะŸั–ะดะณะพั‚ะพะฒะบะฐ ะดะพ ะฟะพะฒะฝะพะณะพ ะฒะธะดะฐะปะตะฝะฝั %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "ะŸะพะฒะฝั–ัั‚ัŽ ะฒะธะดะฐะปะตะฝะพ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ะะตะผะพะถะปะธะฒะพ ะทะฐะฟะธัะฐั‚ะธ ะฒ ะปะพะณ, ะฟั€ะพะฑะปะตะผะฐ ะท openpty() (ะฝะต ะทะผะพะฝั‚ะพะฒะฐะฝะพ /dev/pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "ะ’ะธะบะพะฝัƒั”ั‚ัŒัั dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "ะžะฟะตั€ะฐั†ั–ัŽ ะฑัƒะปะพ ะฟะตั€ะตั€ะฒะฐะฝะพ ะดะพ ั‚ะพะณะพ, ัะบ ะฒะพะฝะฐ ะผะฐะปะฐ ะทะฐะฒะตั€ัˆะธั‚ะธัั"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "ะ—ะฒั–ั‚ apport ะฝะต ะฑัƒะฒ ะทะฐะฟะธัะฐะฝะธะน, ั‚ะพะผัƒ ั‰ะพ ะฟะฐั€ะฐะผะตั‚ั€ MaxReports ะฒะถะต ะดะพััะณะฝัƒะฒ "
 "ะผะฐะบัะธะผะฐะปัŒะฝะพั— ะฒะตะปะธั‡ะธะฝะธ"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "ะฟั€ะพะฑะปะตะผะธ ะท ะทะฐะปะตะถะฝะพัั‚ัะผะธ - ะทะฐะปะธัˆะตะฝะพ ะฝะตะฝะฐะปะฐัˆั‚ะพะฒะฐะฝะธะผ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3481,7 +3513,7 @@ msgstr ""
 "ะ—ะฒั–ั‚ apport ะฝะต ะฑัƒะฒ ะทะฐะฟะธัะฐะฝะธะน, ั‚ะพะผัƒ ั‰ะพ ะฟะพะฒั–ะดะพะผะปะตะฝะฝั ะฟั€ะพ ะฟะพะผะธะปะบัƒ ะฒะบะฐะทัƒั” ะฝะฐ ั‚ะต, "
 "ั‰ะพ ั†ั ะฟะพะผะธะปะบะฐ ั” ะฝะฐัะปั–ะดะบะพะผ ะฟะพะฟะตั€ะตะดะฝัŒะพั— ะฝะตะฒะดะฐั‡ั–."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3497,13 +3529,7 @@ msgstr ""
 "ะ—ะฒั–ั‚ apport ะฝะต ะฑัƒะฒ ะทะฐะฟะธัะฐะฝะธะน, ั‚ะพะผัƒ ั‰ะพ ะฟะพะฒั–ะดะพะผะปะตะฝะฝั ะฟั€ะพ ะฟะพะผะธะปะบัƒ ะฒะบะฐะทัƒั” ะฝะฐ "
 "ะฒั–ะดััƒั‚ะฝั–ัั‚ัŒ ะฒั–ะปัŒะฝะพะณะพ ะผั–ัั†ั ัƒ ะฟะฐะผ'ัั‚ั–"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3538,21 +3564,8 @@ msgstr ""
 msgid "Not locked"
 msgstr "ะะต ะทะฐะฑะปะพะบะพะฒะฐะฝะพ"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr ""
-#~ "ะกั‚ะฐะปะพัั ั‰ะพััŒ ะดะธะฒะฝะต ะฟั€ะธ ัะฟั€ะพะฑั– ะพั‚ั€ะธะผะฐั‚ะธ IP ะฐะดั€ะตั ะดะปั '%s:%s' (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ะ’ะธะบะพะฝะฐะฝะพ"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "ะ’ะธะฝะธะบะปะฐ ะฟะพะผะธะปะบะฐ ะฟั–ะด ั‡ะฐั ะฟะตั€ะตะฒั–ั€ะบะธ ะฟั–ะดะฟะธััƒ. ะ ะตะฟะพะทะธั‚ะพั€ั–ะน ะฝะต ะพะฝะพะฒะปะตะฝะพ, "
-#~ "ะฟะพะฟะตั€ะตะดะฝั– ั–ะฝะดะตะบัะฝั– ั„ะฐะนะปะธ ะฑัƒะดัƒั‚ัŒ ะฒะธะบะพั€ะธัั‚ะฐะฝั–. ะŸะพะผะธะปะบะฐ GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "ะคะฐะนะป %s ะฟะพั‡ะธะฝะฐั”ั‚ัŒัั ะท ะฝะต 'clearsigned' ะฟะพะฒั–ะดะพะผะปะตะฝะฝัะผ"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ะŸั€ะพะฟัƒัะบะฐั”ั‚ัŒัั ะฝะตั–ัะฝัƒัŽั‡ะธะน ั„ะฐะนะป %s"
diff --git a/po/vi.po b/po/vi.po
index 0f86cae34..54807e201 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2012-11-20 14:12+0700\n"
 "Last-Translator: Trแบงn Ngแปc Quรขn <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -99,74 +99,74 @@ msgstr "Tแป•ng chแป— ฤ‘รฃ tรญnh: "
 msgid "Package file %s is out of sync."
 msgstr "Tแบญp tin gรณi %s khรดng ฤ‘แป“ng bแป™ ฤ‘ฦฐแปฃc."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Khรดng tรฌm thแบฅy gรณi"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "Bแบกn phแบฃi ฤ‘ฦฐa ra รญt nhแบฅt 1 chuแป—i tรฌm kiแบฟm"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Lแป‡nh nร y ฤ‘รฃ bแป‹ loแบกi bแป. Xin hรฃy dรนng lแป‡nh 'apt-mark showauto' ฤ‘แปƒ thay thแบฟ."
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Khรดng thแปƒ ฤ‘แป‹nh vแป‹ gรณi %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "Tแบญp tin gรณi:"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Bแป™ nhแป› tแบกm khรดng ฤ‘แป“ng bแป™ ฤ‘ฦฐแปฃc nรชn khรดng thแปƒ tham chiแบฟu chรฉo tแบญp tin gรณi"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "Cรกc gรณi ฤ‘รฃ ghim:"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(khรดng tรฌm thแบฅy)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ฤรฃ cร i ฤ‘แบทt: "
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  แปจng cแปญ: "
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(khรดng cรณ)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  Ghim gรณi: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  Bแบฃng phiรชn bแบฃn:"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s dร nh cho %s ฤ‘ฦฐแปฃc biรชn dแป‹ch %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,20 +240,28 @@ msgstr ""
 "ฤแปƒ tรฌm thรดng tin thรชm, xem hai trang man (hฦฐแป›ng dแบซn)\n"
 "                 apt-cache(8) vร  apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Hรฃy cung cแบฅp tรชn cho ฤฤฉa nร y, nhฦฐ โ€œDebian 5.0.3 ฤฤฉa 1โ€"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Hรฃy nแบกp ฤ‘ฤฉa vร o แป• vร  bแบฅm nรบt Enter"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Gแบทp lแป—i khi gแบฏn โ€œ%sโ€ vร o โ€œ%sโ€"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Hรฃy lแบทp lแบกi tiแบฟn trรฌnh nร y cho cรกc ฤฤฉa cรฒn lแบกi trong bแป™ ฤ‘ฤฉa cแปงa bแบกn."
 
@@ -489,7 +497,7 @@ msgstr "Khรดng thแปƒ cร i ฤ‘แบทt lแบกi %s vรฌ khรดng thแปƒ tแบฃi vแป nรณ.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s lร  phiรชn bแบฃn mฦกi nhแบฅt.\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ฤ‘ฦฐแปฃc ฤ‘แบทt thร nh โ€œฤ‘ฦฐแปฃc cร i ฤ‘แบทt bแบฑng tayโ€.\n"
@@ -599,8 +607,8 @@ msgstr "Sau thao tรกc nร y, %sB dung lฦฐแปฃng ฤ‘ฤฉa thรชm sแบฝ ฤ‘ฦฐแปฃc dรนng th
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tรกc nร y, %sB dung lฦฐแปฃng ฤ‘ฤฉa sแบฝ ฤ‘ฦฐแปฃc giแบฃi phรณng.\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Khรดng thแปƒ tรฌm ฤ‘ฦฐแปฃc chแป— trแป‘ng trong %s"
@@ -640,7 +648,7 @@ msgstr "Hแปงy bแป."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Bแบกn cรณ muแป‘n tiแบฟp tแปฅc khรดng? [C/k] "
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Viแป‡c lแบฅy %s bแป‹ lแป—i  %s\n"
@@ -649,7 +657,7 @@ msgstr "Viแป‡c lแบฅy %s bแป‹ lแป—i  %s\n"
 msgid "Some files failed to download"
 msgstr "Mแป™t sแป‘ tแบญp tin khรดng tแบฃi vแป ฤ‘ฦฐแปฃc"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "Mแป›i tแบฃi vแป xong vร  trong chแบฟ ฤ‘แป™ chแป‰ tแบฃi vแป"
 
@@ -732,7 +740,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "Cรณ lแบฝ thรดng tin theo ฤ‘รขy sแบฝ giรบp ฤ‘แปก quyแบฟt ฤ‘แป‹nh trฦฐแปng hแปฃp:"
 
@@ -777,7 +785,7 @@ msgstr ""
 "Gรณi cรฒn phแปฅ thuแป™c vร o phแบงn mแปm chฦฐa cรณ. Hรฃy cแป‘ chแบกy lแป‡nh โ€œapt-get -f "
 "installโ€ mร  khรดng cรณ gรณi nร o (hoแบทc ghi rรต cรกch quyแบฟt ฤ‘แป‹nh)."
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -789,33 +797,33 @@ msgstr ""
 "bแบฅt ฤ‘แป‹nh, cรณ lแบฝ chฦฐa tแบกo mแป™t sแป‘ gรณi cแบงn thiแบฟt,\n"
 "hoแบทc chฦฐa di chuyแปƒn chรบng ra phแบงn Incoming (ฤแบฟn)."
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "Gรณi bแป‹ hแปng"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "Nhแปฏng gรณi thรชm theo ฤ‘รขy sแบฝ ฤ‘ฦฐแปฃc cร i ฤ‘แบทt:"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "Cรกc gรณi ฤ‘แป nghแป‹:"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "Gรณi khuyแบฟn khรญch:"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Khรดng tรฌm thแบฅy gรณi %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ฤ‘ฦฐแปฃc ฤ‘แบทt thร nh โ€œฤ‘ฦฐแปฃc tแปฑ ฤ‘แป™ng cร i ฤ‘แบทtโ€.\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -823,46 +831,46 @@ msgstr ""
 "Lแป‡nh nร y ฤ‘รฃ bแป‹ loแบกi bแป. Xin hรฃy dรนng lแป‡nh 'apt-mark auto' vร  'apt-mark "
 "manual' ฤ‘แปƒ thay thแบฟ."
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ฤang tรญnh bฦฐแป›c nรขng cแบฅp... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "Gแบทp lแป—i"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "Hoร n tแบฅt"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Lแป—i nแป™i bแป™: bแป™ thรกo gแปก vแบฅn ฤ‘แป ฤ‘รฃ ngแบฏt gรฌ"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "Khรดng thแปƒ khoรก thฦฐ mแปฅc tแบฃi vแป"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Khรดng tรฌm thแบฅy nguแป“n cho viแป‡c tแบฃi vแป phiรชn bแบฃn '%s' of '%s'"
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr "ฤang tแบฃi vแป %s %s"
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "Phแบฃi ghi rรต รญt nhแบฅt mแป™t gรณi cho ฤ‘รณ cแบงn lแบฅy mรฃ nguแป“n"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Khรดng tรฌm thแบฅy gรณi nguแป“n cho %s"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -872,7 +880,7 @@ msgstr ""
 "โ€œ%sโ€ tแบกi:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
@@ -883,69 +891,69 @@ msgstr ""
 "bzr branch %s\n"
 "ฤ‘แปƒ lแบฅy cรกc gรณi mแป›i nhแบฅt (cรณ thแปƒ lร  chฦฐa phรกt hร nh).\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ฤang bแป qua tแบญp tin ฤ‘รฃ ฤ‘ฦฐแปฃc tแบฃi vแป โ€œ%sโ€\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Khรดng ฤ‘แปง sแปฉc chแปฉa cรฒn rแบฃnh trong %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Cแบงn phแบฃi lแบฅy %sB/%sB kho nguแป“n.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Cแบงn phแบฃi lแบฅy %sB tแปซ kho nguแป“n.\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lแบฅy nguแป“n %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "Viแป‡c lแบฅy mแป™t sแป‘ kho bแป‹ lแป—i."
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "ฤang bแป qua giแบฃi nรฉn nguแป“n ฤ‘รฃ giแบฃi nรฉn trong %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lแป‡nh giแบฃi nรฉn โ€œ%sโ€ bแป‹ lแป—i.\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Hรฃy kiแปƒm tra xem gรณi โ€œdpkg-devโ€ cรณ ฤ‘ฦฐแปฃc cร i ฤ‘แบทt chฦฐa.\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lแป‡nh xรขy dแปฅng โ€œ%sโ€ bแป‹ lแป—i.\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "Tiแบฟn trรฌnh con bแป‹ lแป—i"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Phแบฃi ghi rรต รญt nhแบฅt mแป™t gรณi cแบงn kiแปƒm tra cรกch phแปฅ thuแป™c khi xรขy dแปฅng cho nรณ"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -954,17 +962,17 @@ msgstr ""
 "Khรดng cรณ thรดng tin kiแบฟn trรบc sแบตn sร ng cho %s. Xem apt.conf(5) APT::"
 "Architectures ฤ‘แปƒ cร i ฤ‘แบทt"
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Khรดng thแปƒ lแบฅy thรดng tin vแป cรกch phแปฅ thuแป™c khi xรขy dแปฅng cho %s"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s khรดng phแปฅ thuแป™c vร o gรฌ khi xรขy dแปฅng.\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -972,20 +980,20 @@ msgid ""
 msgstr ""
 "phแปฅ thuแป™c %s cho %s khรดng แป•n thแปa bแปŸi vรฌ %s khรดng ฤ‘ฦฐแปฃc cho phรฉp trรชn gรณi '%s'"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "cรกch phแปฅ thuแป™c %s cho %s khรดng thแปƒ ฤ‘ฦฐแปฃc thแปa vรฌ khรดng tรฌm thแบฅy gแปi %s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Viแป‡c cแป‘ thแปa cรกch phแปฅ thuแป™c %s cho %s bแป‹ lแป—i vรฌ gรณi ฤ‘รฃ cร i ฤ‘แบทt %s quรก mแป›i"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -994,7 +1002,7 @@ msgstr ""
 "cรกch phแปฅ thuแป™c %s cho %s khรดng thแปƒ ฤ‘ฦฐแปฃc thแปa mรฃn phiรชn bแบฃn แปฉng cแปญ cแปงa gรณi %s "
 "cรณ thแปƒ thแปa mรฃn ฤ‘iแปu kiแป‡n phiรชn bแบฃn"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1003,30 +1011,30 @@ msgstr ""
 "cรกch phแปฅ thuแป™c %s cho %s khรดng thแปƒ ฤ‘ฦฐแปฃc thแปa mรฃn bแปŸi vรฌ gรณi %s khรดng cรณ bแบฃn "
 "แปฉng cแปญ"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Viแป‡c cแป‘ thแปa cรกch phแปฅ thuแป™c %s cho %s bแป‹ lแป—i: %s."
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Khรดng thแปƒ thแปa cรกch phแปฅ thuแป™c khi xรขy dแปฅng cho %s."
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "Viแป‡c xแปญ lรฝ cรกch phแปฅ thuแป™c khi xรขy dแปฅng bแป‹ lแป—i"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog cho %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Mรด-ฤ‘un ฤ‘รฃ hแป— trแปฃ:"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1119,7 +1127,7 @@ msgstr ""
 "       apt-get(8), sources.list(5) vร  apt.conf(5).\n"
 "                       Trรฌnh APT nร y cรณ nฤƒng lแปฑc cแปงa siรชu bรฒ.\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1194,7 +1202,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ฤ‘รฃ sแบตn ฤ‘ฦฐแปฃc ฤ‘แบทt lร  chฦฐa nแบฏm giแปฏ.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "ฤรฃ ฤ‘แปฃi %s nhฦฐng mร  chฦฐa gแบทp nรณ"
@@ -1352,8 +1361,8 @@ msgstr "Thแปi hแบกn kแบฟt nแป‘i"
 msgid "Server closed the connection"
 msgstr "Mรกy phแปฅc vแปฅ ฤ‘รฃ ฤ‘รณng kแบฟt nแป‘i"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "Lแป—i ฤ‘แปc"
 
@@ -1366,8 +1375,8 @@ msgid "Protocol corruption"
 msgstr "Giao thแปฉc bแป‹ hแปng"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "Lแป—i ghi"
 
@@ -1421,7 +1430,7 @@ msgstr "Quรก giแป kแบฟt nแป‘i แป• cแบฏm dแปฏ liแป‡u"
 msgid "Unable to accept connection"
 msgstr "Khรดng thแปƒ chแบฅp nhแบญn kแบฟt nแป‘i"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "Gแบทp khรณ khฤƒn khi tแบกo chuแป—i duy nhแบฅt cho tแบญp tin"
 
@@ -1448,87 +1457,100 @@ msgstr "Truy vแบฅn"
 msgid "Unable to invoke "
 msgstr "Khรดng thแปƒ gแปi "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ฤang kแบฟt nแป‘i ฤ‘แบฟn %s (%s)..."
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[ฤแป‹a chแป‰ IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Khรดng thแปƒ tแบกo แป• cแบฏm cho %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Khรดng thแปƒ sแปŸ khแปŸi kแบฟt nแป‘i ฤ‘แบฟn %s:%s (%s)."
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Khรดng thแปƒ kแบฟt nแป‘i ฤ‘แบฟn %s:%s (%s), kแบฟt nแป‘i ฤ‘รฃ quรก giแป"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Khรดng thแปƒ kแบฟt nแป‘i ฤ‘แบฟn %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ฤang kแบฟt nแป‘i ฤ‘แบฟn %s..."
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Khรดng thแปƒ thรกo gแปก โ€œ%sโ€"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Viแป‡c thรกo gแปก โ€œ%sโ€ bแป‹ lแป—i tแบกm thแปi"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Gแบทp lแป—i nghiแป‡m trแปng khi thรกo gแปก โ€œ%s:%sโ€ (%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Gแบทp lแป—i nghiแป‡m trแปng khi thรกo gแปก โ€œ%s:%sโ€ (%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Khรดng thแปƒ kแบฟt nแป‘i ฤ‘แบฟn %s: %s:"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Lแป—i nแป™i bแป™: chแปฏ kรฝ ฤ‘รบng, nhฦฐng khรดng thแปƒ quyแบฟt ฤ‘แป‹nh vรขn tay cแปงa khรณa ?!"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Gแบทp รญt nhแบฅt mแป™t chแปฏ kรฝ khรดng hแปฃp lแป‡."
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Khรดng thแปƒ thแปฑc hiแป‡n โ€œgpgvโ€ ฤ‘แปƒ thแบฉm tra chแปฏ kรฝ (gpgv ฤ‘รฃ ฤ‘ฦฐแปฃc cร i ฤ‘แบทt chฦฐa?)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Gแบทp lแป—i khรดng rรต khi thแปฑc hiแป‡n gpgv"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "Nhแปฏng chแปฏ kรฝ theo ฤ‘รขy vแบซn khรดng hแปฃp lแป‡:\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1571,53 +1593,53 @@ msgstr "Mรกy phแปฅc vแปฅ HTTP ฤ‘รฃ ngแบฏt cรกch hแป— trแปฃ phแบกm vแป‹"
 msgid "Unknown date format"
 msgstr "Khรดng rรต dแบกng ngร y"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "Viแป‡c chแปn bแป‹ lแป—i"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "Kแบฟt nแป‘i ฤ‘รฃ quรก giแป"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "Gแบทp lแป—i khi ghi vร o tแบญp tin xuแบฅt"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "Gแบทp lแป—i khi ghi vร o tแบญp tin"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "Gแบทp lแป—i khi ghi vร o tแบญp tin ฤ‘รณ"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gแบทp lแป—i khi ฤ‘แปc tแปซ mรกy phแปฅc vแปฅ: cuแป‘i แปŸ xa ฤ‘รฃ ฤ‘รณng kแบฟt nแป‘i"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "Gแบทp lแป—i khi ฤ‘แปc tแปซ mรกy phแปฅc vแปฅ"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "Dแปฏ liแป‡u dรฒng ฤ‘แบงu sai"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "Kแบฟt nแป‘i bแป‹ ngแบฏt"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "Gแบทp lแป—i nแป™i bแป™"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Khรดng thแปƒ ฤ‘แปc %s"
@@ -1644,7 +1666,12 @@ msgstr "Khรดng tรฌm thแบฅy tแบญp tin nhรขn bแบฃn โ€œ%sโ€"
 msgid "Can not read mirror file '%s'"
 msgstr "Khรดng thแปƒ ฤ‘แปc tแบญp tin mirror '%s'"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Khรดng thแปƒ ฤ‘แปc tแบญp tin mirror '%s'"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Nhรขn bแบฃn: %s]"
@@ -1744,7 +1771,7 @@ msgstr ""
 "  -c=? ฤแปc tแบญp tin cแบฅu hรฌnh nร y\n"
 "  -o=? ฤแบทt mแป™t tรนy chแปn cแบฅu hรฌnh nhiแป‡m รฝ, v.d. โ€œ-o dir::cache=/tmpโ€\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Khรดng thแปƒ ghi vร o %s"
@@ -1905,8 +1932,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "Khรดng thแปƒ mแปŸ tแบญp tin cฦก sแปŸ dแปฏ liแป‡u %s: %s."
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Viแป‡c lแบฅy thรดng tin toร n bแป™ cho %s bแป‹ lแป—i"
@@ -1919,87 +1946,87 @@ msgstr "Kho khรดng cรณ mแปฅc ghi ฤ‘iแปu khiแปƒn"
 msgid "Unable to get a cursor"
 msgstr "Khรดng thแปƒ lแบฅy con chแบกy"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "CB: Khรดng thแปƒ ฤ‘แปc thฦฐ mแปฅc %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "CB: Khรดng thแปƒ lแบฅy thรดng tin toร n bแป™ cho %s\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "Lแป–I: "
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "CB: "
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "Lแป–I: cรณ lแป—i รกp dแปฅng vร o tแบญp tin "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Viแป‡c quyแบฟt ฤ‘แป‹nh %s bแป‹ lแป—i"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "Viแป‡c di chuyแปƒn qua cรขy bแป‹ lแป—i"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "Viแป‡c mแปŸ %s bแป‹ lแป—i"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Bแป liรชn kแบฟt %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Viแป‡c tแบกo liรชn kแบฟt lแบกi %s bแป‹ lแป—i"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Viแป‡c bแป liรชn kแบฟt %s bแป‹ lแป—i"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Viแป‡c liรชn kแบฟt %s ฤ‘แบฟn %s bแป‹ lแป—i"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Hแบฟt hแบกn bแป liรชn kแบฟt cแปงa %sB.\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "Kho khรดng cรณ trฦฐแปng gรณi"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s khรดng cรณ mแปฅc ghi ฤ‘รจ\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ngฦฐแปi bแบฃo trรฌ %s lร  %s khรดng phแบฃi %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s khรดng cรณ mแปฅc ghi ฤ‘รจ nguแป“n\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s cลฉng khรดng cรณ mแปฅc ghi ฤ‘รจ nhแป‹ phรขn\n"
@@ -2073,7 +2100,7 @@ msgstr "Viแป‡c ฤ‘แปc khi tรญnh MD5 bแป‹ lแป—i"
 msgid "Problem unlinking %s"
 msgstr "Gแบทp lแป—i khi bแป liรชn kแบฟt %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Viแป‡c ฤ‘แป•i tรชn %s thร nh %s bแป‹ lแป—i"
@@ -2133,23 +2160,23 @@ msgstr ""
 "  -c=? ฤแปc tแบญp tin cแบฅu hรฌnh nร y\n"
 "  -o=? ฤแบทt tรนy chแปn cแบฅu hรฌnh nhiแป‡m รฝ, v.d. โ€œ-o dir::cache=/tmpโ€\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "Viแป‡c tแบกo nhแปฏng แป‘ng bแป‹ lแป—i"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "Viแป‡c thแปฑc hiแป‡n gzip bแป‹ lแป—i "
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "Kho bแป‹ hแปng."
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Lแป—i kiแปƒm tแป•ng tar, kho bแป‹ hแปng"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Khรดng rรต kiแปƒu phแบงn ฤ‘แบงu tar %u, bแป™ phแบญn %s"
@@ -2220,54 +2247,54 @@ msgstr "Viแป‡c ghi tแบญp tin %s gแบทp lแป—i"
 msgid "Failed to close file %s"
 msgstr "Viแป‡c ฤ‘รณng tแบญp tin %s gแบทp lแป—i"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "ฤฦฐแปng dแบซn %s quรก dร i"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "ฤang giแบฃi nรฉn %s nhiแปu lแบงn"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Thฦฐ mแปฅc %s bแป‹ trแป‡ch hฦฐแป›ng"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Gรณi nร y ฤ‘ang cแป‘ ghi vร o ฤ‘รญch trแป‡ch ฤ‘i %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "ฤฦฐแปng dแบซn trแป‡ch ฤ‘i quรก dร i."
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Thฦฐ mแปฅc %s ฤ‘ang ฤ‘ฦฐแปฃc thay thแบฟ do ฤ‘iแปu khรดng phแบฃi lร  thฦฐ mแปฅc"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "Viแป‡c ฤ‘แป‹nh vแป‹ ฤ‘iแปƒm nรบt trong hแป™p bฤƒm nรณ bแป‹ lแป—i"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "ฤฦฐแปng dแบซn quรก dร i"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Ghi ฤ‘รจ lรชn gรณi ฤ‘รฃ khแป›p mร  khรดng cรณ phiรชn bแบฃn cho %s"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Tแบญp tin %s/%s ghi ฤ‘รจ lรชn ฤ‘iแปu trong gรณi %s"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Khรดng thแปƒ lแบฅy cรกc thรดng tin vแป %s"
@@ -2350,30 +2377,30 @@ msgstr ""
 "dรนng tแบฏt."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lingร y %ligiแป %liphรบt %ligiรขy"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%ligiแป %liphรบt %ligiรขy"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liphรบt %ligiรขy"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%ligiรขy"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "Khรดng tรฌm thแบฅy vรนng chแปn %s"
@@ -2444,6 +2471,16 @@ msgstr "%c%s... Lแป—i!"
 msgid "%c%s... Done"
 msgstr "%c%s... Hoร n tแบฅt"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Hoร n tแบฅt"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2504,44 +2541,44 @@ msgstr "Viแป‡c lแบฅy cac thรดng tin cho ฤ‘ฤฉa CD-ROM bแป‹ lแป—i"
 msgid "Problem closing the gzip file %s"
 msgstr "Gแบทp vแบฅn ฤ‘แป khi ฤ‘รณng tแบญp tin gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Khรดng dรนng khแบฃ nฤƒng khรณa cho tแบญp tin khรณa chแป‰ ฤ‘แปc %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Khรดng thแปƒ mแปŸ tแบญp tin khรณa %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Khรดng dรนng khแบฃ nฤƒng khรณa cho tแบญp tin khรณa ฤ‘รฃ lแบฏp kiแปƒu NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Khรดng thแปƒ lแบฅy khรณa %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 "Liแป‡t kรช cรกc tแบญp tin khรดng thแปƒ ฤ‘ฦฐแปฃc tแบกo ra vรฌ '%s' khรดng phแบฃi lร  mแป™t thฦฐ mแปฅc"
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Bแป qua '%s' trong thฦฐ mแปฅc '%s'vรฌ nรณ khรดng phแบฃi lร  tแบญp tin bรฌnh thฦฐแปng"
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Bแป qua tแบญp tin '%s' trong thฦฐ mแปฅc '%s' vรฌ nรณ khรดng cรณ phแบงn ฤ‘uรดi mแปŸ rแป™ng"
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2549,73 +2586,79 @@ msgstr ""
 "Bแป qua tแบญp tin '%s' trong thฦฐ mแปฅc '%s' vรฌ nรณ cรณ phแบงn ฤ‘uรดi mแปŸ rแป™ng khรดng hแปฃp "
 "lแป‡"
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Tiแบฟn trรฌnh phแปฅ %s ฤ‘รฃ nhแบญn mแป™t lแป—i chia ra tแปซng ฤ‘oแบกn."
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Tiแบฟn trรฌnh phแปฅ %s ฤ‘รฃ nhแบญn tรญn hiแป‡u %u."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Tiแบฟn trรฌnh phแปฅ %s ฤ‘รฃ trแบฃ lแปi mรฃ lแป—i (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Tiแบฟn trรฌnh phแปฅ %s ฤ‘รฃ thoรกt bแบฅt thฦฐแปng"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "Khรดng thแปƒ mแปŸ tแบญp tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Khรดng thแปƒ mแปŸ bแป™ mรด tแบฃ tแบญp tin %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "Viแป‡c tแบกo tiแบฟn trรฌnh con IPC bแป‹ lแป—i"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "Viแป‡c thแปฑc hiแป‡n bรด nรฉn bแป‹ lแป—i "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "ฤ‘แปc, cรฒn cแบงn ฤ‘แปc %llu nhฦฐng mร  khรดng cรณ gรฌ cรฒn lแบกi cแบฃ"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ghi, cรฒn cแบงn ghi %llu nhฦฐng mร  khรดng thแปƒ"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Gแบทp vแบฅn ฤ‘แป khi ฤ‘รณng tแบญp tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gแบทp vแบฅn ฤ‘แป khi thay tรชn tแบญp tin %s bแบฑng %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gแบทp vแบฅn ฤ‘แป khi bแป liรชn kแบฟt tแบญp tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "Gแบทp vแบฅn ฤ‘แป khi ฤ‘แป“ng bแป™ hรณa tแบญp tin"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Khรดng cรณ vรฒng khoรก nร o ฤ‘ฦฐแปฃc cร i ฤ‘แบทt vร o %s."
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Bแป™ nhแป› tแบกm gรณi trแป‘ng"
@@ -2641,59 +2684,59 @@ msgstr "Trรฌnh APT nร y khรดng hแป— trแปฃ hแป‡ thแป‘ng ฤ‘iแปu khiแปƒn phiรชn bแ
 msgid "The package cache was built for a different architecture"
 msgstr "Bแป™ nhแป› tแบกm gรณi ฤ‘ฦฐแปฃc xรขy dแปฑng cho mแป™t kiแบฟn trแปฉc khรกc"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "Phแปฅ thuแป™c"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "Phแปฅ thuแป™c sแบตn"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ฤแป nghแป‹"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "Khuyแบฟn khรญch"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "Xung ฤ‘แป™t"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "Thay thแบฟ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "Lร m cลฉ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "Lร m hฦฐ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "Tฤƒng cฦฐแปng"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "quan trแปng"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "yรชu cแบงu"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "chuแบฉn"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "tรนy chแปn"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "bแป• sung"
 
@@ -2802,17 +2845,17 @@ msgstr "ฤang mแปŸ %s"
 msgid "Line %u too long in source list %s."
 msgstr "Dรฒng %u quรก dร i trong danh sรกch nguแป“n %s."
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Gแบทp dรฒng dแบกng sai %u trong danh sรกch nguแป“n %s (kiแปƒu)."
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Khรดng biแบฟt kiแปƒu โ€œ%sโ€ trรชn dรฒng %u trong danh sรกch nguแป“n %s."
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2821,12 +2864,12 @@ msgstr ""
 "Khรดng thแปƒ thแปฑc hiแป‡n ngay lแบญp tแปฉc tiแบฟn trรฌnh cแบฅu hรฌnh โ€œ%sโ€. Xem โ€œman 5 apt."
 "conf โ€ dฦฐแป›i โ€œAPT::Immediate-Configureโ€ ฤ‘แปƒ tรฌm chi tiแบฟt. (%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Khรดng thแปƒ cแบฅu hรฌnh '%s'. "
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2849,7 +2892,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Cแบงn phแบฃi cร i ฤ‘แบทt lแบกi gรณi %s, nhฦฐng mร  khรดng thแปƒ tรฌm kho cho nรณ."
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2857,11 +2900,11 @@ msgstr ""
 "Lแป—i: โ€œpkgProblemResolver::Resolveโ€ (bแป™ thรกo gแปก vแบฅn ฤ‘แป gแปi::thรกo gแปก) ฤ‘รฃ tแบกo "
 "ra nhiแปu chแป— ngแบฏt, cรณ lแบฝ mแป™t sแป‘ gรณi ฤ‘รฃ giแปฏ lแบกi ฤ‘รฃ gรขy ra trฦฐแปng hแปฃp nร y."
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Khรดng thแปƒ sแปญa vแบฅn ฤ‘แป, bแบกn ฤ‘รฃ giแปฏ lแบกi mแป™t sแป‘ gรณi bแป‹ ngแบฏt."
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2869,7 +2912,7 @@ msgstr ""
 "Mแป™t sแป‘ tแบญp tin chแป‰ mแปฅc khรดng tแบฃi vแป ฤ‘ฦฐแปฃc. Chรบng ฤ‘รฃ bแป‹ bแป qua, hoแบทc cรกi cลฉ ฤ‘รฃ "
 "ฤ‘ฦฐแปฃc dรนng thay thแบฟ."
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Thiแบฟu thฦฐ mแปฅc danh sรกch %spartial."
@@ -2906,17 +2949,17 @@ msgstr "Khรดng tรฌm thแบฅy trรฌnh ฤ‘iแปu khiแปƒn phฦฐฦกng phรกp %s."
 msgid "Method %s did not start correctly"
 msgstr "Phฦฐฦกng phรกp %s ฤ‘รฃ khรดng bแบฏt ฤ‘แบงu cho ฤ‘รบng."
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Hรฃy nแบกp ฤ‘ฤฉa cรณ nhรฃn โ€œ%sโ€ vร o แป• โ€œ%sโ€ vร  bแบฅm nรบt Enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Khรดng hแป— trแปฃ hแป‡ thแป‘ng ฤ‘รณng gรณi โ€œ%sโ€"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Khรดng thแปƒ quyแบฟt ฤ‘แป‹nh kiแปƒu hแป‡ thแป‘ng ฤ‘รณng gรณi thรญch hแปฃp"
 
@@ -2974,14 +3017,14 @@ msgstr "Bแป™ nhแป› tแบกm cรณ hแป‡ thแป‘ng ฤ‘iรชu khiแปƒn phiรชn bแบฃn khรดng tฦฐ
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Gแบทp lแป—i khi xแปญ lรฝ %s (%s%d)"
@@ -3002,26 +3045,26 @@ msgstr "แป’, bแบกn ฤ‘รฃ vฦฐแปฃt quรก sแป‘ mรด tแบฃ mร  trรฌnh APT nร y cรณ thแปƒ
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "แป’, bแบกn ฤ‘รฃ vฦฐแปฃt quรก sแป‘ cรกch phแปฅ thuแป™c mร  trรฌnh APT nร y cรณ thแปƒ quแบฃn lรฝ."
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Khรดng tรฌm thแบฅy gรณi %s %s khi xแปญ lรฝ quan hแป‡ phแปฅ thuแป™c cแปงa tแบญp tin"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Khรดng thแปƒ lแบฅy cรกc thรดng tin vแป danh sรกch gรณi nguแป“n %s"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ฤang ฤ‘แปc cรกc danh sรกch gรณi"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ฤang tแบญp hแปฃp cรกc Nhร  cung cแบฅp Tแบญp tin"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "Lแป—i nhแบญp/xuแบฅt khi lฦฐu bแป™ nhแป› tแบกm nguแป“n"
 
@@ -3034,12 +3077,12 @@ msgstr "viแป‡c thay ฤ‘แป•i tรชn bแป‹ lแป—i, %s (%s โ†’ %s)."
 msgid "MD5Sum mismatch"
 msgstr "Sai khแป›p MD5Sum (tแป•ng kiแปƒm)"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Sai khแป›p tแป•ng chuแป—i duy nhแบฅt (hash sum)"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3048,16 +3091,16 @@ msgstr ""
 "Khรดng tรฌm thแบฅy mแปฅc cแบงn thiแบฟt '%s' trong tแบญp tin Phรกt hร nh (Sai mแปฅc trong "
 "sources.list hoแบทc tแบญp tin bแป‹ hแปng)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Khรดng thแปƒ tรฌm thแบฅy mรฃ bฤƒm tแป•ng kiแปƒm tra cho tแบญp tin Phรกt hร nh %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Khรดng cรณ khรณa cรดng sแบตn sร ng cho nhแปฏng mรฃ sแป‘ khoรก theo ฤ‘รขy:\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3066,15 +3109,15 @@ msgstr ""
 "Tแบญp tin phรกt hร nh %s ฤ‘รฃ hแบฟt hแบกn (khรดng hแปฃp lแป‡ kแปƒ tแปซ %s). Cแบญp nhแบญt cho kho "
 "nร y sแบฝ khรดng ฤ‘ฦฐแปฃc รกp dแปฅng."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Bแบฃn phรกt hร nh xung ฤ‘แป™t: %s (mong ฤ‘แปฃi %s cรฒn nhแบญn %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Gแบทp lแป—i trong khi thแบฉm tra chแปฏ kรฝ.\n"
@@ -3082,12 +3125,12 @@ msgstr ""
 "Lแป—i GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Lแป—i GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3096,7 +3139,7 @@ msgstr ""
 "Khรดng tรฌm thแบฅy tแบญp tin liรชn quan ฤ‘แบฟn gรณi %s. Cรณ lแบฝ bแบกn cแบงn phแบฃi tแปฑ sแปญa gรณi "
 "nร y, do thiแบฟu kiแบฟn trรบc."
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3105,7 +3148,7 @@ msgstr ""
 "Khรดng tรฌm thแบฅy tแบญp tin liรชn quan ฤ‘แบฟn gรณi %s. Cรณ lแบฝ bแบกn cแบงn phแบฃi tแปฑ sแปญa gรณi "
 "nร y."
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3113,33 +3156,33 @@ msgstr ""
 "Cรกc tแบญp tin chแป‰ mแปฅc cแปงa gรณi nร y bแป‹ hแปng. Khรดng cรณ trฦฐแปng Filename: (Tรชn tแบญp "
 "tin:) cho gรณi %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "Sai khแป›p kรญch cแปก"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Khรดng thแปƒ phรขn tรญch cรบ phรกp cแปงa tแบญp tin Phรกt hร nh %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Khรดng cรณ phแบงn nร o trong tแบญp tin Phรกt hร nh %s"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Khรดng cรณ mแปฅc Hash (chuแป—i duy nhแบฅt) nร o trong tแบญp tin Phรกt hร nh %s"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 "Gแบทp mแปฅc nhแบญp โ€œValid-Untilโ€ (hแปฃp lแป‡ ฤ‘แบฟn khi) khรดng hแปฃp lแป‡ trong tแบญp tin Phรกt "
 "hร nh %s"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
@@ -3168,7 +3211,7 @@ msgstr "ฤang nhแบญn diแป‡n... "
 msgid "Stored label: %s\n"
 msgstr "Nhรฃn ฤ‘รฃ lฦฐu: %s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ฤang thรกo lแบฏp ฤ‘ฤฉa CD-ROM...\n"
 
@@ -3231,30 +3274,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ฤang sao chรฉp cรกc danh sรกch gรณi..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ฤang ghi danh sรกch nguแป“n mแป›i\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "Cรกc mแปฅc nhแบญp danh sรกch nguแป“n cho ฤ‘ฤฉa nร y:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Mแป›i ghi %i mแปฅc ghi.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Mแป›i ghi %i mแปฅc ghi vแป›i %i tแบญp tin cรฒn thiแบฟu.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Mแป›i ghi %i mแปฅc ghi vแป›i %i tแบญp tin khรดng khแป›p vแป›i nhau\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3271,17 +3314,6 @@ msgstr "Khรดng tรฌm thแบฅy mแปฅc ghi xรกc thแปฑc cho: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Sai khแป›p chuแป—i duy nhแบฅt cho: %s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Tแบญp tin %s khรดng bแบฏt ฤ‘แบงu bแบฑng mแป™t ฤ‘oแบกn chแปฏ kรฝ (gpg)"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Khรดng cรณ vรฒng khoรก nร o ฤ‘ฦฐแปฃc cร i ฤ‘แบทt vร o %s."
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3349,114 +3381,114 @@ msgstr "Chuแบฉn bแป‹ ฤ‘แปƒ lแบฅy cรกch giแบฃi quyแบฟt"
 msgid "External solver failed without a proper error message"
 msgstr "Bแป™ phรขn giแบฃi bรชn ngoร i gแบทp lแป—i mร  khรดng trแบฃ vแป thรดng tin lแป—i thรญch hแปฃp"
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr "Thi hร nh bแป™ phรขn giแบฃi tแปซ bรชn ngoร i"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ฤang cร i ฤ‘แบทt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ฤang cแบฅu hรฌnh %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ฤang gแปก bแป %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "ฤang gแปก bแป hoร n toร n %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "ฤang ghi lฦฐu sแปฑ biแบฟn mแบฅt cแปงa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ฤang chแบกy bแป™ gรขy nรชn tiแบฟn trรฌnh cuแป‘i cรนng cร i ฤ‘แบทt %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiแบฟu thฦฐ mแปฅc โ€œ%sโ€"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Khรดng thแปƒ mแปŸ tแบญp tin โ€œ%sโ€"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ฤang chuแบฉn bแป‹ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ฤang mแปŸ gรณi %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ฤang chuแบฉn bแป‹ cแบฅu hรฌnh %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ฤรฃ cร i ฤ‘แบทt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ฤang chuแบฉn bแป‹ gแปก bแป %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ฤรฃ gแปก bแป %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ฤang chuแบฉn bแป‹ gแปก bแป hoร n toร n %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Mแป›i gแปก bแป hoร n toร n %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Khรดng thแปƒ ghi lฦฐu, openpty() bแป‹ lแป—i (โ€œ/dev/ptsโ€ chฦฐa lแบฏp ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "ฤang chแบกy dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "Hแป‡ ฤ‘iแปu hร nh ฤ‘รฃ ngแบฏt trฦฐแป›c khi nรณ kแป‹p hoร n thร nh"
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Khรดng ghi bรกo cรกo apport, vรฌ ฤ‘รฃ tแป›i giแป›i hแบกn sแป‘ cรกc bรกo cรกo (MaxReports)"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "gแบทp vแบฅn ฤ‘แป vแป quan hแป‡ phแปฅ thuแป™c nรชn ฤ‘แปƒ lแบกi khรดng cรณ cแบฅu hรฌnh"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3464,7 +3496,7 @@ msgstr ""
 "Khรดng ghi bรกo cรกo apport, vรฌ thรดng ฤ‘iแป‡p lแป—i ngแปฅ รฝ rแบฑng nรณ lร  mแป™t lแป—i kแบฟ tiแบฟp "
 "do mแป™t sแปฑ thแบฅt bแบกi trฦฐแป›c."
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3477,13 +3509,7 @@ msgid ""
 msgstr ""
 "Khรดng ghi bรกo cรกo apport, vรฌ thรดng ฤ‘iแป‡p lแป—i ngแปฅ รฝ mแป™t lแป—i โ€œkhรดng ฤ‘แปง bแป™ nhแป›โ€"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "Khรดng ghi bรกo cรกo apport, vรฌ thรดng ฤ‘iแป‡p lแป—i ngแปฅ รฝ mแป™t lแป—i โ€œV/R dpkgโ€"
@@ -3514,21 +3540,8 @@ msgstr "dpkg bแป‹ giรกn ฤ‘oแบกn, bแบกn cแบงn phแบฃi tแปฑ ฤ‘แป™ng chแบกy โ€œ%sโ€
 msgid "Not locked"
 msgstr "Chฦฐa ฤ‘ฦฐแปฃc khoรก"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "Gแบทp lแป—i nghiแป‡m trแปng khi thรกo gแปก โ€œ%s:%sโ€ (%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... Hoร n tแบฅt"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "Gแบทp lแป—i trong khi thแบฉm tra chแปฏ kรฝ.\n"
-#~ "Kho lฦฐu chฦฐa ฤ‘ฦฐแปฃc cแบญp nhแบญt nรชn dรนng nhแปฏng tแบญp tin chแป‰ mแปฅc trฦฐแป›c.\n"
-#~ "Lแป—i GPG: %s: %s\n"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Tแบญp tin %s khรดng bแบฏt ฤ‘แบงu bแบฑng mแป™t ฤ‘oแบกn chแปฏ kรฝ (gpg)"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "ฤang bแป qua tแบญp tin khรดng tแป“n tแบกi %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ddab31a0..51bfebd4f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -97,72 +97,72 @@ msgstr "ๆ€ปๅ ็”จ็ฉบ้—ด๏ผš"
 msgid "Package file %s is out of sync."
 msgstr "่ฝฏไปถๅŒ…ๆ–‡ไปถ %s ๅฐšๆœชๅŒๆญฅใ€‚"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ๆฒกๆœ‰ๅ‘็ŽฐๅŒน้…็š„่ฝฏไปถๅŒ…"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 msgid "You must give at least one search pattern"
 msgstr "ๆ‚จๅฟ…้กปๆ˜Ž็กฎๅœฐ็ป™ๅ‡บ่‡ณๅฐ‘ไธ€ไธช่กจ่พพๅผ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ๆœชๅ‘็Žฐ่ฝฏไปถๅŒ… %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "่ฝฏไปถๅŒ…ๆ–‡ไปถ๏ผš"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "็ผ“ๅญ˜ๅฐšๆœชๅŒๆญฅ๏ผŒๆ— ๆณ•ไบคๅทฎๅผ•่ฏ(x-ref)ไธ€ไธช่ฝฏไปถๅŒ…ๆ–‡ไปถ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "่ขซ้”ๅฎš็š„่ฝฏไปถๅŒ…๏ผš"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ๆฒกๆœ‰ๆ‰พๅˆฐ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ๅทฒๅฎ‰่ฃ…๏ผš"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ๅ€™้€‰่ฝฏไปถๅŒ…๏ผš"
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(ๆ— )"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ่ฝฏไปถๅŒ…้”๏ผš"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ็‰ˆๆœฌๅˆ—่กจ๏ผš"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s๏ผŒ็”จไบŽ %s ๆž„ๆžถ๏ผŒ็ผ–่ฏ‘ไบŽ %s %s\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -236,20 +236,28 @@ msgstr ""
 "  -o=? ่ฎพ็ฝฎไปปๆ„ๆŒ‡ๅฎš็š„้…็ฝฎ้€‰้กน๏ผŒไพ‹ๅฆ‚ -o dir::cache=/tmp\n"
 "่‹ฅ่ฆไบ†่งฃๆ›ดๅคšไฟกๆฏ๏ผŒๆ‚จ่ฟ˜ๅฏไปฅๆŸฅ้˜… apt-cache(8) ๅ’Œ apt.conf(5) ๅ‚่€ƒๆ‰‹ๅ†Œใ€‚\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "่ฏท็ป™่ฟ™ๅผ ็›˜็‰‡่ตทไธชๅๅญ—๏ผŒๆฏ”ๅฆ‚โ€œDebian 5.0.3 Disk 1โ€"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "่ฏทๆŠŠ็›˜็‰‡ๆ’ๅ…ฅ้ฉฑๅŠจๅ™จๅ†ๆŒ‰ๅ›ž่ฝฆ้”ฎ"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ๆ— ๆณ•ๅฐ† %s ๆŒ‚่ฝฝๅˆฐ %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "่ฏทๅฏนๆ‚จ็š„็›˜็‰‡ๅฅ—ไปถไธญ็š„ๅ…ถๅฎƒ็›˜็‰‡้‡ๅค็›ธๅŒ็š„ๆ“ไฝœใ€‚"
 
@@ -482,7 +490,7 @@ msgstr "ไธ่ƒฝ้‡ๆ–ฐๅฎ‰่ฃ… %s๏ผŒๅ› ไธบๆ— ๆณ•ไธ‹่ฝฝๅฎƒใ€‚\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s ๅทฒ็ปๆ˜ฏๆœ€ๆ–ฐ็š„็‰ˆๆœฌไบ†ใ€‚\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ่ขซ่ฎพ็ฝฎไธบๆ‰‹ๅŠจๅฎ‰่ฃ…ใ€‚\n"
@@ -589,8 +597,8 @@ msgstr "่งฃๅŽ‹็ผฉๅŽไผšๆถˆ่€—ๆŽ‰ %sB ็š„้ขๅค–็ฉบ้—ดใ€‚\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "่งฃๅŽ‹็ผฉๅŽๅฐ†ไผš็ฉบๅ‡บ %sB ็š„็ฉบ้—ดใ€‚\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ๆ— ๆณ•่Žท็Ÿฅๆ‚จๅœจ %s ไธŠ็š„ๅฏ็”จ็ฉบ้—ด"
@@ -629,7 +637,7 @@ msgstr "ไธญๆญขๆ‰ง่กŒใ€‚"
 msgid "Do you want to continue [Y/n]? "
 msgstr "ๆ‚จๅธŒๆœ›็ปง็ปญๆ‰ง่กŒๅ—๏ผŸ[Y/n]"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ๆ— ๆณ•ไธ‹่ฝฝ %s  %s\n"
@@ -638,7 +646,7 @@ msgstr "ๆ— ๆณ•ไธ‹่ฝฝ %s  %s\n"
 msgid "Some files failed to download"
 msgstr "ๆœ‰ไธ€ไบ›ๆ–‡ไปถๆ— ๆณ•ไธ‹่ฝฝ"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ไธ‹่ฝฝๅฎŒๆฏ•๏ผŒ็›ฎๅ‰ๆ˜ฏโ€œไป…ไธ‹่ฝฝโ€ๆจกๅผ"
 
@@ -715,7 +723,7 @@ msgstr "ไผผไนŽ่‡ชๅŠจๅธ่ฝฝๅทฅๅ…ทๆŸๅไบ†ไธ€ไบ›่ฝฏไปถ๏ผŒ่ฟ™ไธๅบ”่ฏฅๅ‘็”Ÿใ€‚่ฏท
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ไธ‹ๅˆ—ไฟกๆฏๅฏ่ƒฝไผšๅฏน่งฃๅ†ณ้—ฎ้ข˜ๆœ‰ๆ‰€ๅธฎๅŠฉ๏ผš"
 
@@ -760,7 +768,7 @@ msgstr ""
 "ๆœ‰ๆœช่ƒฝๆปก่ถณ็š„ไพ่ต–ๅ…ณ็ณปใ€‚่ฏทๅฐ่ฏ•ไธๆŒ‡ๆ˜Ž่ฝฏไปถๅŒ…็š„ๅๅญ—ๆฅ่ฟ่กŒโ€œapt-get -f installโ€(ไนŸๅฏ"
 "ไปฅๆŒ‡ๅฎšไธ€ไธช่งฃๅ†ณๅŠžๆณ•)ใ€‚"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -771,78 +779,78 @@ msgstr ""
 "ๅ› ไธบ็ณป็ปŸๆ— ๆณ•่พพๅˆฐๆ‚จ่ฆๆฑ‚็š„็Šถๆ€้€ ๆˆ็š„ใ€‚่ฏฅ็‰ˆๆœฌไธญๅฏ่ƒฝไผšๆœ‰ไธ€ไบ›ๆ‚จ้œ€่ฆ็š„่ฝฏไปถ\n"
 "ๅŒ…ๅฐšๆœช่ขซๅˆ›ๅปบๆˆ–ๆ˜ฏๅฎƒไปฌๅทฒ่ขซไปŽๆ–ฐๅˆฐ(Incoming)็›ฎๅฝ•็งปๅ‡บใ€‚"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "็ ดๆŸ็š„่ฝฏไปถๅŒ…"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ๅฐ†ไผšๅฎ‰่ฃ…ไธ‹ๅˆ—้ขๅค–็š„่ฝฏไปถๅŒ…๏ผš"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ๅปบ่ฎฎๅฎ‰่ฃ…็š„่ฝฏไปถๅŒ…๏ผš"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ๆŽจ่ๅฎ‰่ฃ…็š„่ฝฏไปถๅŒ…๏ผš"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ่ฝฏไปถๅŒ… %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ่ขซ่ฎพ็ฝฎไธบๆ‰‹ๅŠจๅฎ‰่ฃ…ใ€‚\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "ๆญฃๅœจๅฏนๅ‡็บง่ฟ›่กŒ่ฎก็ฎ—... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ๅคฑ่ดฅ"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ๅฎŒๆˆ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ๅ†…้ƒจ้”™่ฏฏ๏ผŒ้—ฎ้ข˜่งฃๅ†ณๅทฅๅ…ทๅไบ‹ไบ†"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "ๆ— ๆณ•้”ๅฎšไธ‹่ฝฝ็›ฎๅฝ•"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "่ฆไธ‹่ฝฝๆบไปฃ็ ๏ผŒๅฟ…้กปๆŒ‡ๅฎš่‡ณๅฐ‘ไธ€ไธชๅฏนๅบ”็š„่ฝฏไปถๅŒ…"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ๆ— ๆณ•ๆ‰พๅˆฐไธŽ %s ๅฏนๅบ”็š„ๆบไปฃ็ ๅŒ…"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -851,7 +859,7 @@ msgstr ""
 "ๆ็คบ๏ผš%s ็š„ๆ‰“ๅŒ…ๅทฅไฝœ่ขซ็ปดๆŠคไบŽไปฅไธ‹ไฝ็ฝฎ็š„ %s ็‰ˆๆœฌๆŽงๅˆถ็ณป็ปŸไธญ๏ผš\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -862,104 +870,104 @@ msgstr ""
 "bzr get %s\n"
 "่Žทๅพ—่ฏฅ่ฝฏไปถๅŒ…็š„ๆœ€่ฟ‘ๆ›ดๆ–ฐ(ๅฏ่ƒฝๅฐšๆœชๆญฃๅผๅ‘ๅธƒ)ใ€‚\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "ๅฟฝ็•ฅๅทฒไธ‹่ฝฝ่ฟ‡็š„ๆ–‡ไปถโ€œ%sโ€\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ๆ‚จๅœจ %s ไธŠๆฒกๆœ‰่ถณๅคŸ็š„ๅฏ็”จ็ฉบ้—ด"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "้œ€่ฆไธ‹่ฝฝ %sB/%sB ็š„ๆบไปฃ็ ๅŒ…ใ€‚\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "้œ€่ฆไธ‹่ฝฝ %sB ็š„ๆบไปฃ็ ๅŒ…ใ€‚\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ไธ‹่ฝฝๆบไปฃ็  %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "ๆœ‰ไธ€ไบ›ๅŒ…ๆ–‡ไปถๆ— ๆณ•ไธ‹่ฝฝใ€‚"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "ๅฟฝ็•ฅๅทฒ็ป่ขซ่งฃๅŒ…ๅˆฐ %s ็›ฎๅฝ•็š„ๆบไปฃ็ ๅŒ…\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "่ฟ่กŒ่งฃๅŒ…็š„ๅ‘ฝไปคโ€œ%sโ€ๅ‡บ้”™ใ€‚\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "่ฏทๆฃ€ๆŸฅๆ˜ฏๅฆๅฎ‰่ฃ…ไบ†โ€œdpkg-devโ€่ฝฏไปถๅŒ…ใ€‚\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ๆ‰ง่กŒๆž„้€ ่ฝฏไปถๅŒ…ๅ‘ฝไปคโ€œ%sโ€ๅคฑ่ดฅใ€‚\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ๅญ่ฟ›็จ‹ๅ‡บ้”™"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "่ฆๆฃ€ๆŸฅ็”Ÿๆˆ่ฝฏไปถๅŒ…็š„ๆž„ๅปบไพ่ต–ๅ…ณ็ณป๏ผŒๅฟ…้กปๆŒ‡ๅฎš่‡ณๅฐ‘ไธ€ไธช่ฝฏไปถๅŒ…"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ๆ— ๆณ•่Žทๅพ— %s ็š„ๆž„ๅปบไพ่ต–ๅ…ณ็ณปไฟกๆฏ"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s ๆฒกๆœ‰ๆž„ๅปบไพ่ต–ๅ…ณ็ณปไฟกๆฏใ€‚\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "็”ฑไบŽๆ— ๆณ•ๆ‰พๅˆฐ่ฝฏไปถๅŒ… %3$s ๏ผŒๅ› ๆญคไธ่ƒฝๆปก่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ไพ่ต–ๅ…ณ็ณป"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "็”ฑไบŽๆ— ๆณ•ๆ‰พๅˆฐ่ฝฏไปถๅŒ… %3$s ๏ผŒๅ› ๆญคไธ่ƒฝๆปก่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ไพ่ต–ๅ…ณ็ณป"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ๆ— ๆณ•ๆปก่ถณ %2$s ๆ‰€่ฆๆฑ‚ %1$s ไพ่ต–ๅ…ณ็ณป๏ผšๅทฒๅฎ‰่ฃ…็š„่ฝฏไปถๅŒ… %3$s ๅคชๆ–ฐ"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -968,37 +976,37 @@ msgstr ""
 "็”ฑไบŽๆ— ๆณ•ๆ‰พๅˆฐ็ฌฆๅˆ่ฆๆฑ‚็š„่ฝฏไปถๅŒ… %3$s ็š„ๅฏ็”จ็‰ˆๆœฌ๏ผŒๅ› ๆญคไธ่ƒฝๆปก่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ "
 "%1$s ไพ่ต–ๅ…ณ็ณป"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "็”ฑไบŽๆ— ๆณ•ๆ‰พๅˆฐ่ฝฏไปถๅŒ… %3$s ๏ผŒๅ› ๆญคไธ่ƒฝๆปก่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ไพ่ต–ๅ…ณ็ณป"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ๆ— ๆณ•ๆปก่ถณ %2$s ๆ‰€่ฆๆฑ‚ %1$s ไพ่ต–ๅ…ณ็ณป๏ผš%3$s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไธ่ƒฝๆปก่ถณ่ฝฏไปถๅŒ… %s ๆ‰€่ฆๆฑ‚็š„ๆž„ๅปบไพ่ต–ๅ…ณ็ณปใ€‚"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "ๆ— ๆณ•ๅค„็†ๆž„ๅปบไพ่ต–ๅ…ณ็ณป"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ๆญฃๅœจ่ฟžๆŽฅ %s (%s)"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ๆ”ฏๆŒ็š„ๆจกๅ—๏ผš"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1086,7 +1094,7 @@ msgstr ""
 "ไปฅ่Žทๅ–ๆ›ดๅคšไฟกๆฏๅ’Œ้€‰้กนใ€‚\n"
 "                       ๆœฌ APT ๅ…ทๆœ‰่ถ…็บง็‰›ๅŠ›ใ€‚\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1160,7 +1168,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ๅทฒ็ปๆ˜ฏๆœ€ๆ–ฐ็š„็‰ˆๆœฌไบ†ใ€‚\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "็ญ‰ๅพ…ๅญ่ฟ›็จ‹ %s ็š„้€€ๅ‡บ๏ผŒไฝ†ๆ˜ฏๅฎƒๅนถไธๅญ˜ๅœจ"
@@ -1297,8 +1306,8 @@ msgstr "่ฟžๆŽฅ่ถ…ๆ—ถ"
 msgid "Server closed the connection"
 msgstr "ๆœๅŠกๅ™จๅ…ณ้—ญไบ†่ฟžๆŽฅ"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "่ฏป้”™่ฏฏ"
 
@@ -1311,8 +1320,8 @@ msgid "Protocol corruption"
 msgstr "ๅ่ฎฎๆœ‰่ฏฏ"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ๅ†™ๅ‡บ้”™"
 
@@ -1366,7 +1375,7 @@ msgstr "ๆ•ฐๆฎๅฅ—ๆŽฅๅญ—่ฟžๆŽฅ่ถ…ๆ—ถ"
 msgid "Unable to accept connection"
 msgstr "ๆ— ๆณ•ๆŽฅๅ—่ฟžๆŽฅ"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ๆŠŠๆ–‡ไปถๅŠ ๅ…ฅๅ“ˆๅธŒ่กจๆ—ถๅ‡บ้”™"
 
@@ -1393,85 +1402,98 @@ msgstr "ๆŸฅ่ฏข"
 msgid "Unable to invoke "
 msgstr "ๆ— ๆณ•่ฐƒ็”จ "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ๆญฃๅœจ่ฟžๆŽฅ %s (%s)"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ๆ— ๆณ•ไธบ %s ๅˆ›ๅปบๅฅ—ๆŽฅๅญ—(f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ๆ— ๆณ•ๅ‘่ตทไธŽ %s:%s (%s) ็š„่ฟžๆŽฅ"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ๆ— ๆณ•่ฟžๆŽฅไธŠ %s:%s (%s)๏ผŒ่ฟžๆŽฅ่ถ…ๆ—ถ"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ๆ— ๆณ•่ฟžๆŽฅไธŠ %s:%s (%s)ใ€‚"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ๆญฃๅœจ่ฟžๆŽฅ %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ๆ— ๆณ•่งฃๆžๅŸŸๅโ€œ%sโ€"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ๆš‚ๆ—ถไธ่ƒฝ่งฃๆžๅŸŸๅโ€œ%sโ€"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "่งฃๆžโ€œ%s:%sโ€ๆ—ถ๏ผŒๅ‡บ็Žฐไบ†ๆŸไบ›ๆ•…้šœ(%i - %s)"
+
+#: methods/connect.cc:211
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "่งฃๆžโ€œ%s:%sโ€ๆ—ถ๏ผŒๅ‡บ็Žฐไบ†ๆŸไบ›ๆ•…้šœ(%i - %s)"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ไธ่ƒฝ่ฟžๆŽฅๅˆฐ %s๏ผš%s๏ผš"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ๅ†…้ƒจ้”™่ฏฏ๏ผš็ญพๅๆญฃ็กฎๆ— ่ฏฏ๏ผŒไฝ†ๆ˜ฏๆ— ๆณ•็กฎ่ฎคๅฏ†้’ฅๆŒ‡็บน๏ผŸ๏ผ"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "่‡ณๅฐ‘ๅ‘็Žฐไธ€ไธชๆ— ๆ•ˆ็š„็ญพๅใ€‚"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "ๆ— ๆณ•่ฟ่กŒ gpgv ไปฅ้ชŒ่ฏ็ญพๅ(ๆ‚จๅฎ‰่ฃ…ไบ† gpgv ๅ—๏ผŸ)"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "่ฟ่กŒ gpgv ๆ—ถๅ‘็”Ÿๆœช็Ÿฅ้”™่ฏฏ"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ไธ‹ๅˆ—็ญพๅๆ— ๆ•ˆ๏ผš\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1509,53 +1531,53 @@ msgstr "่ฏฅ HTTP ๆœๅŠกๅ™จ็š„ range ๆ”ฏๆŒไธๆญฃๅธธ"
 msgid "Unknown date format"
 msgstr "ๆ— ๆณ•่ฏ†ๅˆซ็š„ๆ—ฅๆœŸๆ ผๅผ"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "select ่ฐƒ็”จๅ‡บ้”™"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "่ฟžๆŽฅ่ถ…ๆ—ถ"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ๅ†™่พ“ๅ‡บๆ–‡ไปถๆ—ถๅ‡บ้”™"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ๅ†™ๅ…ฅๆ–‡ไปถๅ‡บ้”™"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ๅ†™ๅ…ฅๆ–‡ไปถๅ‡บ้”™"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ไปŽๆœๅŠกๅ™จ่ฏปๅ–ๆ•ฐๆฎๆ—ถๅ‡บ้”™๏ผŒๅฏนๆ–นๅ…ณ้—ญไบ†่ฟžๆŽฅ"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ไปŽๆœๅŠกๅ™จ่ฏปๅ–ๆ•ฐๆฎๅ‡บ้”™"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "้”™่ฏฏ็š„ๆŠฅๅคดๆ•ฐๆฎ"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "่ฟžๆŽฅๅคฑ่ดฅ"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ๅ†…้ƒจ้”™่ฏฏ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "ๆ— ๆณ•่ฏปๅ– %s"
@@ -1582,7 +1604,12 @@ msgstr "ๆฒกๆœ‰ๆ‰พๅˆฐ้•œๅƒๆ–‡ไปถ %s"
 msgid "Can not read mirror file '%s'"
 msgstr "ๆฒกๆœ‰ๆ‰พๅˆฐ้•œๅƒๆ–‡ไปถ %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "ๆฒกๆœ‰ๆ‰พๅˆฐ้•œๅƒๆ–‡ไปถ %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[้•œๅƒ๏ผš%s]"
@@ -1672,7 +1699,7 @@ msgstr ""
 "  -c=? ่ฏปๆŒ‡ๅฎš็š„้…็ฝฎๆ–‡ไปถ\n"
 "  -o=? ่ฎพ็ฝฎไปปๆ„ๆŒ‡ๅฎš็š„้…็ฝฎ้€‰้กน๏ผŒไพ‹ๅฆ‚ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅ %s"
@@ -1816,8 +1843,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆ•ฐๆฎๅบ“ๆ–‡ไปถ %s๏ผš%s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "ๆ— ๆณ•่Žทๅพ— %s ็š„็Šถๆ€"
@@ -1830,87 +1857,87 @@ msgstr "ๅฝ’ๆกฃๆ–‡ไปถๆฒกๆœ‰ๅŒ…ๅซๆŽงๅˆถๅญ—ๆฎต"
 msgid "Unable to get a cursor"
 msgstr "ๆ— ๆณ•่Žทๅพ—ๆธธๆ ‡"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "่ญฆๅ‘Š๏ผšๆ— ๆณ•่ฏปๅ–็›ฎๅฝ• %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "่ญฆๅ‘Š๏ผšๆ— ๆณ•่Žทๅพ— %s ็š„็Šถๆ€\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "้”™่ฏฏ๏ผš"
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "่ญฆๅ‘Š๏ผš"
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "้”™่ฏฏ๏ผšๅค„็†ๆ–‡ไปถๆ—ถๅ‡บ้”™ "
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "ๆ— ๆณ•่งฃๆž %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "ๆ— ๆณ•้ๅŽ†็›ฎๅฝ•ๆ ‘"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "ๆ— ๆณ•่ฏปๅ–็ฌฆๅท้“พๆŽฅ %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "ๆ— ๆณ•ไฝฟ็”จ unlink ๅˆ ้™ค %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ๆ— ๆณ•ๅฐ† %s ้“พๆŽฅๅˆฐ %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ่พพๅˆฐไบ† DeLink ็š„ไธŠ้™ %sBใ€‚\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ๅฝ’ๆกฃๆ–‡ไปถๆฒกๆœ‰ๅŒ…ๅซ package ๅญ—ๆฎต"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ไธญๆฒกๆœ‰ override ้กน\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ็š„็ปดๆŠค่€… %s ๅนถ้ž %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ๆฒกๆœ‰ๆบไปฃ็ ็š„ override ้กน\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ไธญๆฒกๆœ‰ไบŒ่ฟ›ๅˆถๆ–‡ไปถ็š„ override ้กน\n"
@@ -1984,7 +2011,7 @@ msgstr "ๅœจ่ฎก็ฎ— MD5 ๆ ก้ชŒๅ’Œๆ—ถๆ— ๆณ•่ฏปๅ–ๆ•ฐๆฎ"
 msgid "Problem unlinking %s"
 msgstr "ๅœจไฝฟ็”จ unlink ๅˆ ้™ค %s ๆ—ถๅ‡บ้”™"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ๆ— ๆณ•ๅฐ† %s ้‡ๅ‘ฝๅไธบ %s"
@@ -2042,23 +2069,23 @@ msgstr ""
 "  -c=? ่ฏปๅ–ๆŒ‡ๅฎš้…็ฝฎๆ–‡ไปถ\n"
 "  -o=? ่ฎพ็ฝฎไปปๆ„ๆŒ‡ๅฎš็š„้…็ฝฎ้€‰้กน๏ผŒไพ‹ๅฆ‚ -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบ็ฎก้“"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "ๆ— ๆณ•ๆ‰ง่กŒ gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ๅŒ…ๆ–‡ไปถๅทฒ่ขซๆŸๅ"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar ็š„ๆ ก้ชŒๅ’Œไธ็ฌฆ๏ผŒๆ–‡ไปถๅทฒๆŸๅ"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ๆœช็Ÿฅ็š„ TAR ๆ•ฐๆฎๅคด็ฑปๅž‹ %u๏ผŒๆˆๅ‘˜ %s"
@@ -2129,54 +2156,54 @@ msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅๆ–‡ไปถ %s"
 msgid "Failed to close file %s"
 msgstr "ๆ— ๆณ•ๅ…ณ้—ญๆ–‡ไปถ %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "่ทฏๅพ„ๅ %s ๅคช้•ฟ"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s ่ขซ่งฃๅŒ…ไบ†ไธๅชไธ€ๆฌก"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "็›ฎๅฝ• %s ๅทฒ่ขซ่ฝฌ็งป"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "่ฏฅ่ฝฏไปถๅŒ…ๆญฃๅฐ่ฏ•ๅ†™ๅ…ฅ่ฝฌ็งปๅฏน่ฑก %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "่ฏฅ่ฝฌ็งป่ทฏๅพ„ๅคช้•ฟ"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "็›ฎๅฝ• %s ่ฆ่ขซไธ€ไธช้ž็›ฎๅฝ•็š„ๆ–‡ไปถๆ›ฟๆข"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ๆ— ๆณ•ๅœจๅ…ถๆ•ฃๅˆ—ๆกถไธญๅˆ†้…่Š‚็‚น"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "่ทฏๅพ„ๅๅคช้•ฟ"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "็”จๆฅ่ฆ†็›–็š„่ฝฏไปถๅŒ…ไธๅฑžไบŽ %s ็š„ไปปไฝ•็‰ˆๆœฌ"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ๆ–‡ไปถ %s/%s ไผš่ฆ†็›–ๅฑžไบŽ่ฝฏไปถๅŒ… %s ไธญ็š„ๅŒๅๆ–‡ไปถ"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ๆ— ๆณ•่ฏปๅ– %s ็š„็Šถๆ€"
@@ -2254,30 +2281,30 @@ msgid ""
 msgstr "ๆ— ๆณ•ๅขžๅŠ  MMap ๅคงๅฐ๏ผŒๅ› ไธบ็”จๆˆทๅทฒ็ฆ็”จ่‡ชๅŠจๅขžๅŠ ใ€‚"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%liๅคฉ %liๅฐๆ—ถ %liๅˆ† %li็ง’"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%liๅฐๆ—ถ %liๅˆ† %li็ง’"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
 msgstr "%liๅˆ† %li็ง’"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
 msgstr "%li็ง’"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "ๆ‰พไธๅˆฐๆ‚จ้€‰ๅˆ™็š„ %s"
@@ -2347,6 +2374,16 @@ msgstr "%c%s... ๆœ‰้”™่ฏฏ๏ผ"
 msgid "%c%s... Done"
 msgstr "%c%s... ๅฎŒๆˆ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ๅฎŒๆˆ"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2407,114 +2444,120 @@ msgstr "ๆ— ๆณ•่ฏปๅ–็›˜็‰‡็š„็Šถๆ€"
 msgid "Problem closing the gzip file %s"
 msgstr "ๅ…ณ้—ญ gzip %s ๆ–‡ไปถๅ‡บ้”™"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "็”ฑไบŽๆ–‡ไปถ็ณป็ปŸไธบๅช่ฏป๏ผŒๅ› ่€Œๆ— ๆณ•ไฝฟ็”จๆ–‡ไปถ้” %s"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€้”ๆ–‡ไปถ %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "ๆ— ๆณ•ๅœจ nfs ๆ–‡ไปถ็ณป็ปŸไธŠไฝฟ็”จๆ–‡ไปถ้” %s"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ๆ— ๆณ•่Žทๅพ—้” %s"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ๅญ่ฟ›็จ‹ %s ๅ‘็”Ÿไบ†ๆฎต้”™่ฏฏ"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ๅญ่ฟ›็จ‹ %s ๆ”ถๅˆฐไฟกๅท %uใ€‚"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ๅญ่ฟ›็จ‹ %s ่ฟ”ๅ›žไบ†ไธ€ไธช้”™่ฏฏๅท (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ๅญ่ฟ›็จ‹ %s ๅผ‚ๅธธ้€€ๅ‡บ"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆ–‡ไปถ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆ–‡ไปถๆ่ฟฐ็ฌฆ %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "ๆ— ๆณ•ๅˆ›ๅปบๅญ่ฟ›็จ‹็š„ IPC ็ฎก้“"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "ๆ— ๆณ•ๆ‰ง่กŒๅŽ‹็ผฉ็จ‹ๅบ"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "่ฏปๅ–ๆ–‡ไปถๅ‡บ้”™๏ผŒ่ฟ˜ๅ‰ฉ %lu ๅญ—่Š‚ๆฒกๆœ‰่ฏปๅ‡บ"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ๅ†™ๅ…ฅๆ–‡ไปถๅ‡บ้”™๏ผŒ่ฟ˜ๅ‰ฉ %lu ๅญ—่Š‚ๆฒกๆœ‰ไฟๅญ˜"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ๅ…ณ้—ญๆ–‡ไปถ %s ๅ‡บ้”™"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "้‡ๅ‘ฝๅๆ–‡ไปถ %s ไธบ %s ๅ‡บ้”™"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "็”จ unlink ๅˆ ้™คๆ–‡ไปถ %s ๅ‡บ้”™"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ๅŒๆญฅๆ–‡ไปถๅ‡บ้”™"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s ไธญๆฒกๆœ‰ๅฎ‰่ฃ…ๅฏ†้’ฅ็Žฏใ€‚"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "่ฝฏไปถๅŒ…็ผ“ๅญ˜ๅŒบๆ˜ฏ็ฉบ็š„"
@@ -2541,59 +2584,59 @@ msgstr "ๆœฌ็จ‹ๅบ็›ฎๅ‰ไธๆ”ฏๆŒโ€œ%sโ€็‰ˆๆœฌ็ณป็ปŸ"
 msgid "The package cache was built for a different architecture"
 msgstr "่ฝฏไปถๅŒ…็ผ“ๅญ˜ๅŒบๆ˜ฏไธบๅ…ถๅฎƒๆžถๆž„็š„็กฌไปถๆž„ๅปบ็š„"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "ไพ่ต–"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "้ข„ไพ่ต–"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ๅปบ่ฎฎ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ๆŽจ่"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "ๅ†ฒ็ช"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ๆ›ฟๆข"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ๅบŸๅผƒ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "็ ดๅ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
 msgstr "ๅขžๅผบ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "้‡่ฆ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ๅฟ…้œ€"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ๆ ‡ๅ‡†"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ๅฏ้€‰"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "้ขๅค–"
 
@@ -2693,17 +2736,17 @@ msgstr "ๆญฃๅœจๆ‰“ๅผ€ %s"
 msgid "Line %u too long in source list %s."
 msgstr "ๆบๅˆ—่กจ %2$s ็š„็ฌฌ %1$u ่กŒๅคช้•ฟไบ†ใ€‚"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ๅœจๆบๅˆ—่กจ %2$s ไธญ็ฌฌ %1$u ่กŒ็š„ๆ ผๅผๆœ‰่ฏฏ(็ฑปๅž‹)"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ๆ— ๆณ•่ฏ†ๅˆซๅœจๆบๅˆ—่กจ %3$s ้‡Œ๏ผŒ็ฌฌ %2$u ่กŒไธญ็š„่ฝฏไปถๅŒ…็ฑปๅˆซโ€œ%1$sโ€"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2712,12 +2755,12 @@ msgstr ""
 "ๆ— ๆณ•็ซ‹ๅณๅฏน %s ่ฟ›่กŒ้…็ฝฎใ€‚่ฏทๆŸฅ็œ‹ man 5 apt.conf ไธญ็š„ APT::Immediate-Configure "
 "(%d)"
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆ–‡ไปถ %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2739,7 +2782,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "่ฝฏไปถๅŒ… %s ้œ€่ฆ้‡ๆ–ฐๅฎ‰่ฃ…๏ผŒไฝ†ๆ˜ฏๆˆ‘ๆ— ๆณ•ๆ‰พๅˆฐ็›ธๅบ”็š„ๅฎ‰่ฃ…ๆ–‡ไปถใ€‚"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2747,13 +2790,13 @@ msgstr ""
 "้”™่ฏฏ๏ผŒpkgProblemResolver::Resolve ๅ‘็”Ÿๆ•…้šœ๏ผŒ่ฟ™ๅฏ่ƒฝๆ˜ฏๆœ‰่ฝฏไปถๅŒ…่ขซ่ฆๆฑ‚ไฟๆŒ็Žฐ็Šถ็š„"
 "็ผ˜ๆ•…ใ€‚"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "ๆ— ๆณ•ไฟฎๆญฃ้”™่ฏฏ๏ผŒๅ› ไธบๆ‚จ่ฆๆฑ‚ๆŸไบ›่ฝฏไปถๅŒ…ไฟๆŒ็Žฐ็Šถ๏ผŒๅฐฑๆ˜ฏๅฎƒไปฌ็ ดๅไบ†่ฝฏไปถๅŒ…้—ด็š„ไพ่ต–ๅ…ณ"
 "็ณปใ€‚"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2761,7 +2804,7 @@ msgid ""
 msgstr ""
 "ๆœ‰ไธ€ไบ›็ดขๅผ•ๆ–‡ไปถไธ่ƒฝไธ‹่ฝฝ๏ผŒๅฎƒไปฌๅฏ่ƒฝ่ขซๅฟฝ็•ฅไบ†๏ผŒไนŸๅฏ่ƒฝ่ฝฌ่€Œไฝฟ็”จไบ†ๆ—ง็š„็ดขๅผ•ๆ–‡ไปถใ€‚"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "่ฝฏไปถๅŒ…ๅˆ—่กจ็š„็›ฎๅฝ• %spartial ็ผบๅคฑใ€‚"
@@ -2798,17 +2841,17 @@ msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ่Žทๅ–่ฝฏไปถๅŒ…็š„ๆธ ้“ %s ๆ‰€้œ€็š„้ฉฑๅŠจ็จ‹ๅบใ€‚"
 msgid "Method %s did not start correctly"
 msgstr "่Žทๅ–่ฝฏไปถๅŒ…็š„ๆธ ้“ %s ๆ‰€้œ€็š„้ฉฑๅŠจ็จ‹ๅบๆฒกๆœ‰ๆญฃๅธธๅฏๅŠจใ€‚"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "่ฏทๆŠŠๆ ‡ๆœ‰โ€œ%sโ€็š„็›˜็‰‡ๆ’ๅ…ฅ้ฉฑๅŠจๅ™จโ€œ%sโ€ๅ†ๆŒ‰ๅ›ž่ฝฆ้”ฎใ€‚"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ไธๆ”ฏๆŒโ€œ%sโ€ๆ‰“ๅŒ…็ณป็ปŸ"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ๆ— ๆณ•็กฎๅฎš้€‚ๅˆ็š„ๆ‰“ๅŒ…็ณป็ปŸ็ฑปๅž‹"
 
@@ -2861,14 +2904,14 @@ msgstr "่ฝฏไปถๅŒ…ๆš‚ๅญ˜ๅŒบไฝฟ็”จ็š„ๆ˜ฏไธๅ…ผๅฎน็š„็‰ˆๆœฌๆŽงๅˆถ็ณป็ปŸ"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ๅค„็† %s (FindPkg)ๆ—ถๅ‡บ้”™"
@@ -2889,26 +2932,26 @@ msgstr "ๅ“‡๏ผŒ่ฝฏไปถๅŒ…่ฏดๆ˜Žๆ•ฐ้‡่ถ…ๅ‡บไบ†ๆœฌ APT ็š„ๅค„็†่ƒฝๅŠ›ใ€‚"
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "ๅ“‡๏ผŒไพ่ต–ๅ…ณ็ณปๆ•ฐ้‡่ถ…ๅ‡บไบ†ๆœฌ APT ็š„ๅค„็†่ƒฝๅŠ›ใ€‚"
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ๅฝ“ๅค„็†ๆ–‡ไปถไพ่ต–ๅ…ณ็ณปๆ—ถ๏ผŒๆ— ๆณ•ๆ‰พๅˆฐ่ฝฏไปถๅŒ… %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ๆ— ๆณ•่Žทๅ–ๆบ่ฝฏไปถๅŒ…ๅˆ—่กจ %s ็š„็Šถๆ€"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ๆญฃๅœจ่ฏปๅ–่ฝฏไปถๅŒ…ๅˆ—่กจ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ๆญฃๅœจๆ”ถ้›†ๆ–‡ไปถๆ‰€ๆไพ›็š„่ฝฏไปถๅŒ…"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ๆ— ๆณ•่ฏปๅ–ๆˆ–ๅ†™ๅ…ฅ่ฝฏไปถๆบ็ผ“ๅญ˜"
 
@@ -2921,54 +2964,54 @@ msgstr "ๆ— ๆณ•้‡ๅ‘ฝๅๆ–‡ไปถ๏ผŒ%s (%s -> %s)ใ€‚"
 msgid "MD5Sum mismatch"
 msgstr "MD5 ๆ ก้ชŒๅ’Œไธ็ฌฆ"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash ๆ ก้ชŒๅ’Œไธ็ฌฆ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ๆ— ๆณ•่งฃๆž่ฝฏไปถๅŒ…ไป“ๅบ“ Release ๆ–‡ไปถ %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ไปฅไธ‹ ID ็š„ๅฏ†้’ฅๆฒกๆœ‰ๅฏ็”จ็š„ๅ…ฌ้’ฅ๏ผš\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ๅ†ฒ็ช็š„ๅ‘่กŒ็‰ˆ๏ผš%s (ๆœŸๆœ› %s ไฝ†ๅพ—ๅˆฐ %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "ๆ ก้ชŒ็ญพๅๅ‡บ้”™ใ€‚ๆญคไป“ๅบ“ๆœช่ขซๆ›ดๆ–ฐ๏ผŒไป็„ถไฝฟ็”จไปฅๅ‰็š„็ดขๅผ•ๆ–‡ไปถใ€‚GPG ้”™่ฏฏ๏ผš%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG ้”™่ฏฏ๏ผš%s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2977,7 +3020,7 @@ msgstr ""
 "ๆˆ‘ๆ— ๆณ•ๆ‰พๅˆฐไธ€ไธชๅฏนๅบ” %s ่ฝฏไปถๅŒ…็š„ๆ–‡ไปถใ€‚ๅœจ่ฟ™็งๆƒ…ๅ†ตไธ‹ๅฏ่ƒฝ้œ€่ฆๆ‚จๆ‰‹ๅŠจไฟฎๆญฃ่ฟ™ไธช่ฝฏไปถ"
 "ๅŒ…ใ€‚(็ผ˜ไบŽๆžถๆž„็ผบๅคฑ)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2985,37 +3028,37 @@ msgid ""
 msgstr ""
 "ๆˆ‘ๆ— ๆณ•ๆ‰พๅˆฐๅฏนๅบ” %s ่ฝฏไปถๅŒ…็š„ๆ–‡ไปถใ€‚ๅœจ่ฟ™็งๆƒ…ๅ†ตไธ‹ๆ‚จๅฏ่ƒฝ้œ€่ฆๆ‰‹ๅŠจไฟฎๆญฃ่ฟ™ไธช่ฝฏไปถๅŒ…ใ€‚"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "่ฝฏไปถๅŒ…็š„็ดขๅผ•ๆ–‡ไปถๅทฒๆŸๅใ€‚ๆ‰พไธๅˆฐๅฏนๅบ”่ฝฏไปถๅŒ… %s ็š„ Filename: ๅญ—ๆฎตใ€‚"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ๅคงๅฐไธ็ฌฆ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ๆ— ๆณ•่งฃๆž่ฝฏไปถๅŒ…ไป“ๅบ“ Release ๆ–‡ไปถ %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "่ฝฏไปถๅŒ…ไป“ๅบ“ Release ๆ–‡ไปถ %s ๅ†…ๆ— ็ป„ไปถ็ซ ่Š‚ไฟกๆฏ"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "่ฝฏไปถๅŒ…ไป“ๅบ“ Release ๆ–‡ไปถ %s ๅ†…ๆ— ๅ“ˆๅธŒๆก็›ฎ"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "่ฝฏไปถๅŒ…ไป“ๅบ“ Release ๆ–‡ไปถ %s ๅ†… Valid-Until ๆก็›ฎๆ— ๆ•ˆ"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "่ฝฏไปถๅŒ…ไป“ๅบ“ Release ๆ–‡ไปถ %s ๅ†… Date ๆก็›ฎๆ— ๆ•ˆ"
@@ -3043,7 +3086,7 @@ msgstr "ๆญฃๅœจ้‰ดๅˆซ.. "
 msgid "Stored label: %s\n"
 msgstr "ๅทฒๅฝ’ๆกฃๆ–‡ไปถ็š„ๆ ‡็ญพ๏ผš%s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ๆญฃๅœจๅธ่ฝฝ CD-ROM...\n"
 
@@ -3107,30 +3150,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ๆญฃๅœจๅคๅˆถ่ฝฏไปถๅŒ…ๅˆ—่กจโ€ฆโ€ฆ"
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ๆญฃๅœจๅ†™ๅ…ฅๆ–ฐ็š„ๆบๅˆ—่กจ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "ๅฏนๅบ”ไบŽ่ฏฅ็›˜็‰‡็š„่ฝฏไปถๆบ่ฎพ็ฝฎ้กนๆ˜ฏ๏ผš\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "ๅทฒๅ†™ๅ…ฅ %i ๆก่ฎฐๅฝ•ใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "ๅทฒๅ†™ๅ…ฅ %i ๆก่ฎฐๅฝ•๏ผŒๅนถๆœ‰ %i ไธชๆ–‡ไปถ็ผบๅคฑใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "ๅทฒๅ†™ๅ…ฅ %i ๆก่ฎฐๅฝ•๏ผŒๅนถๆœ‰ %i ไธชๆ–‡ไปถไธๅŒน้…\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "ๅทฒๅ†™ๅ…ฅ %i ๆก่ฎฐๅฝ•๏ผŒๅนถๆœ‰ %i ไธช็ผบๅคฑ๏ผŒไปฅๅŠ %i ไธชๆ–‡ไปถไธๅŒน้…\n"
@@ -3145,17 +3188,6 @@ msgstr "ๆ— ๆณ•ๆ‰พๅˆฐ่ฎค่ฏ่ฎฐๅฝ•๏ผš%s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash ๆ ก้ชŒๅ’Œไธ็ฌฆ๏ผš%s"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s ไธญๆฒกๆœ‰ๅฎ‰่ฃ…ๅฏ†้’ฅ็Žฏใ€‚"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3219,119 +3251,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ๆญฃๅœจๅฎ‰่ฃ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ๆญฃๅœจ้…็ฝฎ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ๆญฃๅœจๅˆ ้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "ๅฎŒๅ…จๅˆ ้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "ๆณจๆ„ๅˆฐ %s ๅทฒ็ปๆถˆๅคฑ"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ๆ‰ง่กŒๅฎ‰่ฃ…ๅŽๆ‰ง่กŒ็š„่งฆๅ‘ๅ™จ %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "็›ฎๅฝ• %s ็ผบๅคฑ"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ๆ— ๆณ•ๆ‰“ๅผ€ๆ–‡ไปถ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ๆญฃๅœจๅ‡†ๅค‡ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ๆญฃๅœจ่งฃๅŽ‹็ผฉ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ๆญฃๅœจๅ‡†ๅค‡้…็ฝฎ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ๅทฒๅฎ‰่ฃ… %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ๆญฃๅœจๅ‡†ๅค‡ %s ็š„ๅˆ ้™คๆ“ไฝœ"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ๅทฒๅˆ ้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ๆญฃๅœจๅ‡†ๅค‡ๅฎŒๅ…จๅˆ ้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "ๅฎŒๅ…จๅˆ ้™คไบ† %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "ๆ— ๆณ•ๅ†™ๅ…ฅๆ—ฅๅฟ—ใ€‚ openpty() ๅคฑ่ดฅ(ๆฒกๆœ‰ๆŒ‚่ฝฝ /dev/pts ๏ผŸ)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "ๆญฃๅœจ่ฟ่กŒ dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "็”ฑไบŽๅทฒ็ป่พพๅˆฐ MaxReports ้™ๅˆถ๏ผŒๆฒกๆœ‰ๅ†™ๅ…ฅ apport ๆŠฅๅ‘Šใ€‚"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "ไพ่ต–้—ฎ้ข˜ - ไฟๆŒๆœช้…็ฝฎ"
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "ๅ› ไธบ้”™่ฏฏๆถˆๆฏๆŒ‡็คบ่ฟ™ๆ˜ฏ็”ฑไบŽไธŠไธ€ไธช้—ฎ้ข˜ๅฏผ่‡ด็š„้”™่ฏฏ๏ผŒๆฒกๆœ‰ๅ†™ๅ…ฅ apport ๆŠฅๅ‘Šใ€‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3343,13 +3375,7 @@ msgid ""
 "error"
 msgstr "ๅ› ไธบ้”™่ฏฏๆถˆๆฏๆŒ‡็คบ่ฟ™ๆ˜ฏ็”ฑไบŽๅ†…ๅญ˜ไธ่ถณ๏ผŒๆฒกๆœ‰ๅ†™ๅ…ฅ apport ๆŠฅๅ‘Šใ€‚"
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "ๅ› ไธบ้”™่ฏฏๆถˆๆฏๆŒ‡็คบ่ฟ™ๆ˜ฏไธ€ไธช dpkg I/O ้”™่ฏฏ๏ผŒๆฒกๆœ‰ๅ†™ๅ…ฅ apport ๆŠฅๅ‘Šใ€‚"
@@ -3378,20 +3404,6 @@ msgstr "dpkg ่ขซไธญๆ–ญ๏ผŒๆ‚จๅฟ…้กปๆ‰‹ๅทฅ่ฟ่กŒ %s ่งฃๅ†ณๆญค้—ฎ้ข˜ใ€‚"
 msgid "Not locked"
 msgstr "ๆœช้”ๅฎš"
 
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "่งฃๆžโ€œ%s:%sโ€ๆ—ถ๏ผŒๅ‡บ็Žฐไบ†ๆŸไบ›ๆ•…้šœ(%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ๅฎŒๆˆ"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "ๆ ก้ชŒ็ญพๅๅ‡บ้”™ใ€‚ๆญคไป“ๅบ“ๆœช่ขซๆ›ดๆ–ฐ๏ผŒไป็„ถไฝฟ็”จไปฅๅ‰็š„็ดขๅผ•ๆ–‡ไปถใ€‚GPG ้”™่ฏฏ๏ผš%s: %s\n"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "่ทณ่ฟ‡ไธๅญ˜ๅœจ็š„ๆ–‡ไปถ %s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fc2e06a51..82ee4e108 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -97,73 +97,73 @@ msgstr "็ตฑ่จˆๅพŒ็š„็ฉบ้–“ๅˆ่จˆ๏ผš"
 msgid "Package file %s is out of sync."
 msgstr "ๅฅ—ไปถๆช” %s ๆœชๅŒๆญฅใ€‚"
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "ๆœชๆ‰พๅˆฐๅฅ—ไปถ"
 
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "ๆ‚จๅฟ…้ ˆๆ˜Ž็ขบๅพ—็ตฆๅฎšไธ€ๅ€‹ๆจฃๅผ"
 
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "ๆญคๆŒ‡ไปคๅทฒไธๅ†็”จใ€‚่ซ‹ๆ”น็”จ apt-mark showauto"
+msgstr ""
 
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ๆ‰พไธๅˆฐๅฅ—ไปถ %s"
 
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
 msgid "Package files:"
 msgstr "ๅฅ—ไปถๆช”๏ผš"
 
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ๅฟซๅ–่ณ‡ๆ–™ๆœชๅŒๆญฅ๏ผŒ็„กๆณ• x-ref ๅฅ—ไปถๆช”"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
 msgid "Pinned packages:"
 msgstr "้Ž–ๅฎš็š„ๅฅ—ไปถ๏ผš"
 
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
 msgid "(not found)"
 msgstr "(ๆœชๆ‰พๅˆฐ)"
 
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
 msgid "  Installed: "
 msgstr "  ๅทฒๅฎ‰่ฃ๏ผš"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
 msgid "  Candidate: "
 msgstr "  ๅ€™้ธ๏ผš"
 
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
 msgid "(none)"
 msgstr "(็„ก)"
 
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
 msgid "  Package pin: "
 msgstr "  ๅฅ—ไปถ้Ž–ๅฎš๏ผš"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
 msgid "  Version table:"
 msgstr "  ็‰ˆๆœฌๅˆ—่กจ๏ผš"
 
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ๆ˜ฏ็”จๆ–ผ %s ไธฆๅœจ %s %s ไธŠ็ทจ่ญฏ็š„\n"
 
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -236,21 +236,29 @@ msgstr ""
 "  -o=? ๆŒ‡ๅฎšไปปๆ„็š„่จญๅฎš้ธ้ …๏ผŒไพ‹ๅฆ‚:-o dir::cache=/tmp\n"
 "่ซ‹ๅƒ้–ฑ apt-cache(8) ๅŠ apt.conf(5) ๅƒ่€ƒๆ‰‹ๅ†Šไปฅๅ–ๅพ—ๆ›ดๅคš่ณ‡่จŠใ€‚\n"
 
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "่ซ‹ๆ›ฟ้€™ๅผตๅ…‰็ขŸๅ–ๅ€‹ๅๅญ—๏ผŒๅƒๆ˜ฏ 'Debian 2.1r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "่ซ‹ๆŠŠๅ…‰็ขŸๆ”พๅ…ฅๅ…‰็ขŸๆฉŸ๏ผŒ็„ถๅพŒๆŒ‰ไธ‹ [Enter] ้ต"
 
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "็„กๆณ•ๅฐ‡ %s ๆ›ดๅ็‚บ %s"
 
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "่ซ‹ๅฐๆ‚จ็š„ๅ…‰็ขŸ็ต„ไธญ็š„ๅ…ถๅฎƒๅ…‰็ขŸ้‡่ค‡็›ธๅŒ็š„ๆ“ไฝœใ€‚"
 
@@ -292,7 +300,7 @@ msgstr "Y"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -445,7 +453,7 @@ msgstr "ๅฅ—ไปถ %s ๆฒ’ๆœ‰ๅฏๅฎ‰่ฃ็š„ๅ€™้ธ็‰ˆๆœฌ"
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "็„กๆณ•็งป้™คๅฆ‚ %s ็š„่™›ๆ“ฌๅฅ—ไปถ\n"
+msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -483,7 +491,7 @@ msgstr "็„กๆณ•้‡ๆ–ฐๅฎ‰่ฃ %s๏ผŒๅ› ็‚บๅฎƒ็„กๆณ•ไธ‹่ผ‰ใ€‚\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s ๅทฒ็ถ“ๆ˜ฏๆœ€ๆ–ฐ็‰ˆๆœฌไบ†ใ€‚\n"
 
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s ่ขซ่จญๅฎš็‚บๆ‰‹ๅ‹•ๅฎ‰่ฃใ€‚\n"
@@ -590,8 +598,8 @@ msgstr "ๆญคๆ“ไฝœๅฎŒๆˆไน‹ๅพŒ๏ผŒๆœƒๅคšไฝ”็”จ %sB ็š„็ฃ็ขŸ็ฉบ้–“ใ€‚\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "ๆญคๆ“ไฝœๅฎŒๆˆไน‹ๅพŒ๏ผŒๆœƒ็ฉบๅ‡บ %sB ็š„็ฃ็ขŸ็ฉบ้–“ใ€‚\n"
 
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "็„กๆณ•็ขบ่ช %s ็š„ๆœชไฝฟ็”จ็ฉบ้–“"
@@ -630,7 +638,7 @@ msgstr "ๆ”พๆฃ„ๅŸท่กŒใ€‚"
 msgid "Do you want to continue [Y/n]? "
 msgstr "ๆ˜ฏๅฆ็นผ็บŒ้€ฒ่กŒ [Y/n]๏ผŸ"
 
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "็„กๆณ•ๅ–ๅพ— %s๏ผŒ%s\n"
@@ -639,7 +647,7 @@ msgstr "็„กๆณ•ๅ–ๅพ— %s๏ผŒ%s\n"
 msgid "Some files failed to download"
 msgstr "ๆœ‰้ƒจไปฝๆช”ๆกˆ็„กๆณ•ไธ‹่ผ‰"
 
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
 msgid "Download complete and in download only mode"
 msgstr "ไธ‹่ผ‰ๅฎŒๆˆ๏ผŒไธ”้€™ๆ˜ฏใ€Žๅƒ…ไธ‹่ผ‰ใ€ๆจกๅผ"
 
@@ -680,7 +688,7 @@ msgstr ""
 #: cmdline/apt-get.cc:1561
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "็•ฅ้Ž็„กๆณ•ๆไพ›็š„ %2$s ๅฅ—ไปถ็š„ %1$s ็›ฎๆจ™็‰ˆๆœฌ"
+msgstr ""
 
 #: cmdline/apt-get.cc:1593
 #, fuzzy, c-format
@@ -691,7 +699,7 @@ msgstr "็„กๆณ•ๅ–ๅพ—ไพ†ๆบๅฅ—ไปถๅˆ—่กจ %s ็š„็‹€ๆ…‹"
 #: cmdline/apt-get.cc:1631
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "็•ฅ้Ž็„กๆณ•ๆไพ›็š„ %2$s ๅฅ—ไปถ็š„ %1$s ็‰ˆๆœฌ"
+msgstr ""
 
 #: cmdline/apt-get.cc:1647
 msgid "The update command takes no arguments"
@@ -719,7 +727,7 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
 msgid "The following information may help to resolve the situation:"
 msgstr "ไปฅไธ‹็š„่ณ‡่จŠๆˆ–่จฑๆœ‰ๅŠฉๆ–ผ่งฃๆฑบ็•ถๅ‰็š„ๆƒ…ๆณ๏ผš"
 
@@ -768,7 +776,7 @@ msgstr ""
 "ๆœช่ƒฝๆปฟ่ถณ็›ธไพ้—œไฟ‚ใ€‚่ซ‹่ฉฆ่‘—ไธๆŒ‡ๅฎšๅฅ—ไปถไพ†ๅŸท่กŒ 'apt-get -f install'๏ผˆๆˆ–ๆŽกๅ–ๅ…ถๅฎƒ็š„่งฃ"
 "ๆฑบๆ–นๆกˆ๏ผ‰ใ€‚"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -778,195 +786,190 @@ msgstr ""
 "ๆœ‰ไบ›ๅฅ—ไปถ็„กๆณ•ๅฎ‰่ฃใ€‚้€™ๅฏ่ƒฝๆ„่ฌ‚่‘—ๆ‚จ็š„่ฆๆฑ‚้›ฃไปฅ่งฃๆฑบ๏ผŒๆˆ–ๆ˜ฏ่‹ฅๆ‚จไฝฟ็”จ็š„ๆ˜ฏ\n"
 "unstable ็™ผ่กŒ็‰ˆ๏ผŒๅฏ่ƒฝๆœ‰ไบ›ๅฟ…่ฆ็š„ๅฅ—ไปถๅฐšๆœชๅปบ็ซ‹๏ผŒๆˆ–ๆ˜ฏ่ขซ็งปๅ‡บ Incoming ไบ†ใ€‚"
 
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
 msgid "Broken packages"
 msgstr "ๆๆฏ€็š„ๅฅ—ไปถ"
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
 msgid "The following extra packages will be installed:"
 msgstr "ไธ‹ๅˆ—็š„้กๅค–ๅฅ—ไปถๅฐ‡่ขซๅฎ‰่ฃ๏ผš"
 
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
 msgid "Suggested packages:"
 msgstr "ๅปบ่ญฐๅฅ—ไปถ๏ผš"
 
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
 msgid "Recommended packages:"
 msgstr "ๆŽจ่–ฆๅฅ—ไปถ๏ผš"
 
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "็„กๆณ•ๆ‰พๅˆฐๅฅ—ไปถ %s"
 
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s ่ขซ่จญๅฎš็‚บๆ‰‹ๅ‹•ๅฎ‰่ฃใ€‚\n"
 
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
-msgstr "ๆญคๆŒ‡ไปคๅทฒไธๅ†็”จใ€‚่ซ‹ๆ”น็”จ apt-mark auto ๅŠ apt-mark manual"
+msgstr ""
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
 msgid "Calculating upgrade... "
 msgstr "็ฑŒๅ‚™ๅ‡็ดšไธญ... "
 
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
 msgid "Failed"
 msgstr "ๅคฑๆ•—"
 
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
 msgid "Done"
 msgstr "ๅฎŒๆˆ"
 
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ๅ…ง้ƒจ้Œฏ่ชค๏ผŒๅ•้กŒๆŽ’้™คๅ™จ้€ ๆˆไบ†ๆๅฃž"
 
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
 msgid "Unable to lock the download directory"
 msgstr "็„กๆณ•้Ž–ๅฎšไธ‹่ผ‰็›ฎ้Œ„"
 
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
 #, c-format
 msgid "Downloading %s %s"
-msgstr "ไธ‹่ผ‰ %s %s"
+msgstr ""
 
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
 msgid "Must specify at least one package to fetch source for"
 msgstr "ๅœจๅ–ๅพ—ๅŽŸๅง‹็ขผๆ™‚ๅฟ…้ ˆ่‡ณๅฐ‘ๆŒ‡ๅฎšไธ€ๅ€‹ๅฅ—ไปถ"
 
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "็„กๆณ•ๆ‰พๅˆฐ %s ็š„ๅŽŸๅง‹็ขผๅฅ—ไปถ"
 
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"่ซ‹ๆณจๆ„`๏ผš'%s' ๅฅ—ไปถๆ˜ฏๅœจไธ‹ๅˆ—ไฝ็ฝฎ่ขซ '%s' ็‰ˆๆœฌๆŽงๅˆถ็ณป็ตฑๆ‰€็ถญ่ญท็š„`๏ผš\n"
-"%s\n"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"่ซ‹ไปฅ๏ผš\n"
-"bzr branch %s\n"
-"ๅ–ๅพ—่ฉฒๅฅ—ไปถๆœ€ๆ–ฐ (ๅฏ่ƒฝๆœช็™ผไฝˆ) ็š„ๆ›ดๆ–ฐใ€‚\n"
 
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "็•ฅ้Žๅทฒไธ‹่ผ‰็š„ๆช”ๆกˆ '%s'\n"
 
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ๅœจ %s ่ฃกๆฒ’ๆœ‰่ถณๅค ็š„็š„ๆœชไฝฟ็”จ็ฉบ้–“"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "้œ€่ฆไธ‹่ผ‰ %sB/%sB ็š„ๅŽŸๅง‹ๅฅ—ไปถๆช”ใ€‚\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "้œ€่ฆไธ‹่ผ‰ %sB ็š„ๅŽŸๅง‹ๅฅ—ไปถๆช”ใ€‚\n"
 
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ๅ–ๅพ—ๅŽŸๅง‹็ขผ %s\n"
 
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
 msgid "Failed to fetch some archives."
 msgstr "็„กๆณ•ๅ–ๅพ—ๆŸไบ›ๅฅ—ไปถๆช”ใ€‚"
 
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "ไธ่งฃ้–‹๏ผŒๅ› ๅŽŸๅง‹็ขผๅทฒ่งฃ้–‹่‡ณ %s\n"
 
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "่งฃ้–‹ๆŒ‡ไปค '%s' ๅคฑๆ•—ใ€‚\n"
 
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "่ซ‹ๆชขๆŸฅๆ˜ฏๅฆๅทฒๅฎ‰่ฃไบ† 'dpkg-dev' ๅฅ—ไปถใ€‚\n"
 
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "็ทจ่ญฏๆŒ‡ไปค '%s' ๅคฑๆ•—ใ€‚\n"
 
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
 msgid "Child process failed"
 msgstr "ๅญ็จ‹ๅบๅคฑๆ•—"
 
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ๅœจๆชขๆŸฅ็ทจ่ญฏ็›ธไพ้—œไฟ‚ๆ™‚ๅฟ…้ ˆ่‡ณๅฐ‘ๆŒ‡ๅฎšไธ€ๅ€‹ๅฅ—ไปถ"
 
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
-msgstr "ๆฒ’ๆœ‰ๆไพ›็ดš %s ไน‹ๆžถๆง‹่ณ‡่จŠใ€‚่จญ็ฝฎ่ณ‡ๆ–™่ซ‹่ฆ‹ apt.conf(5) APT::Architectures"
+msgstr ""
 
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "็„กๆณ•ๅ–ๅพ— %s ็š„็ทจ่ญฏ็›ธไพ้—œไฟ‚่ณ‡่จŠ"
 
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ๆฒ’ๆœ‰็ทจ่ญฏ็›ธไพ้—œไฟ‚ใ€‚\n"
 
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "็„กๆณ•ๆปฟ่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ็›ธไพ้—œไฟ‚๏ผŒๅ› ็‚บๆ‰พไธๅˆฐๅฅ—ไปถ %3$s"
 
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "็„กๆณ•ๆปฟ่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ็›ธไพ้—œไฟ‚๏ผŒๅ› ็‚บๆ‰พไธๅˆฐๅฅ—ไปถ %3$s"
 
-#: cmdline/apt-get.cc:3051
+#: cmdline/apt-get.cc:3050
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "็„กๆณ•ๆปฟ่ถณ %2$s ็š„็›ธไพ้—œไฟ‚ %1$s๏ผšๅทฒๅฎ‰่ฃ็š„ๅฅ—ไปถ %3$s ๅคชๆ–ฐไบ†"
 
-#: cmdline/apt-get.cc:3090
+#: cmdline/apt-get.cc:3089
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -974,37 +977,37 @@ msgid ""
 msgstr ""
 "็„กๆณ•ๆปฟ่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ็›ธไพ้—œไฟ‚๏ผŒๅ› ็‚บๅฅ—ไปถ %3$s ๆฒ’ๆœ‰็‰ˆๆœฌ็ฌฆๅˆๅ…ถ็‰ˆๆœฌ้œ€ๆฑ‚"
 
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "็„กๆณ•ๆปฟ่ถณ %2$s ๆ‰€่ฆๆฑ‚็š„ %1$s ็›ธไพ้—œไฟ‚๏ผŒๅ› ็‚บๆ‰พไธๅˆฐๅฅ—ไปถ %3$s"
 
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "็„กๆณ•ๆปฟ่ถณ %2$s ็š„็›ธไพ้—œไฟ‚ %1$s๏ผš%3$s"
 
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "็„กๆณ•ๆปฟ่ถณๅฅ—ไปถ %s ็š„็ทจ่ญฏ็›ธไพ้—œไฟ‚ใ€‚"
 
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "็„กๆณ•่™•็†็ทจ่ญฏ็›ธไพ้—œไฟ‚"
 
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ๆญฃๅ’Œ %s (%s) ้€ฃ็ทš"
 
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "ๅทฒๆ”ฏๆดๆจก็ต„๏ผš"
 
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1090,17 +1093,13 @@ msgstr ""
 "ไปฅๅ–ๅพ—ๆ›ดๅคš่ณ‡่จŠๅ’Œ้ธ้ …ใ€‚\n"
 "                        ่ฉฒ APT ๆœ‰่‘—่ถ…็ดš็‰›ๅŠ›ใ€‚\n"
 
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"ๆณจๆ„๏ผš้€™ๅชๆ˜ฏๆจกๆ“ฌ๏ผ\n"
-"      apt-get ้œ€่ฆ root ๆฌŠ้™ๆ‰่ƒฝ็œŸๆญฃๅŸท่กŒใ€‚\n"
-"      ไธฆไบ†่งฃ้Ž–ๅฎš็‹€ๆ…‹ๆœชๅ•Ÿๅ‹•๏ผŒ\n"
-"      ๅ› ๆญคๆœชไพ้™„้—œ่ฏๆ–ผๅฏฆ้š›็›ฎๅ‰็‹€ๆ…‹๏ผ"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1165,7 +1164,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s ๅทฒ็ถ“ๆ˜ฏๆœ€ๆ–ฐ็‰ˆๆœฌไบ†ใ€‚\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "็ญ‰ๅพ… %s ไฝ†ๆ˜ฏๅฎƒไธฆไธๅญ˜ๅœจ"
@@ -1182,7 +1182,7 @@ msgstr "็„กๆณ•้–‹ๅ•Ÿ %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "ๆœช่ƒฝๅŸท่กŒ dpkgใ€‚ๆ‚จๆ˜ฏ root ไฝฟ็”จ่€…ๅ—Ž๏ผŸ"
+msgstr ""
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1301,8 +1301,8 @@ msgstr "้€ฃ็ทš้€พๆ™‚"
 msgid "Server closed the connection"
 msgstr "ไผบๆœๅ™จๅทฒ้—œ้–‰้€ฃ็ทš"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
 msgid "Read error"
 msgstr "่ฎ€ๅ–้Œฏ่ชค"
 
@@ -1315,8 +1315,8 @@ msgid "Protocol corruption"
 msgstr "ๅ”ๅฎšๅคฑๆ•—"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
 msgid "Write error"
 msgstr "ๅฏซๅ…ฅ้Œฏ่ชค"
 
@@ -1370,7 +1370,7 @@ msgstr "Data socket ้€ฃ็ทš้€พๆ™‚"
 msgid "Unable to accept connection"
 msgstr "็„กๆณ•ๆŽฅๅ—้€ฃ็ทš"
 
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
 msgid "Problem hashing file"
 msgstr "ๆœ‰ๅ•้กŒ็š„้›œๆนŠๆช”"
 
@@ -1397,86 +1397,99 @@ msgstr "ๆŸฅ่ฉข"
 msgid "Unable to invoke "
 msgstr "็„กๆณ• invoke "
 
-#: methods/connect.cc:75
+#: methods/connect.cc:76
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "ๆญฃๅ’Œ %s (%s) ้€ฃ็ทš"
 
-#: methods/connect.cc:86
+#: methods/connect.cc:87
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:93
+#: methods/connect.cc:94
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "็„กๆณ•ๅปบ็ซ‹ socket ๆŒ‡ๅ‘ %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:99
+#: methods/connect.cc:100
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "็„กๆณ•ๅˆๅง‹ๅ’Œ %s:%s (%s) ็š„้€ฃ็ทšใ€‚"
 
-#: methods/connect.cc:107
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "็„กๆณ•ๅ’Œ %s:%s (%s) ้€ฃ็ทš๏ผŒ้€ฃ็ทš้€พๆ™‚"
 
-#: methods/connect.cc:125
+#: methods/connect.cc:126
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "็„กๆณ•ๅ’Œ %s:%s (%s) ้€ฃ็ทšใ€‚"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
 msgstr "ๆญฃ้€ฃ็ทš่‡ณ %s"
 
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "็„กๆณ•่งฃๆž '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:205
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ๆšซๆ™‚็„กๆณ•่งฃๆž '%s'"
 
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "ๅœจ่งฃๆž '%s:%s' (%i) ๆ™‚ๅ‡บไบ†ๆ€ชไบ‹"
+
+#: methods/connect.cc:211
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ๅœจ่งฃๆž '%s:%s' (%i) ๆ™‚ๅ‡บไบ†ๆ€ชไบ‹"
 
-#: methods/connect.cc:247
+#: methods/connect.cc:258
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "็„กๆณ•้€ฃ็ทš่‡ณ %s %s๏ผš"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ๅ…ง้ƒจ้Œฏ่ชค๏ผš็ฐฝ็ซ ็„ก่ชค๏ผŒไฝ†ๅป็„กๆณ•่พจ่ญ˜ๅฏ†้‘ฐ็š„ๆŒ‡็ด‹็ขผ๏ผŸ๏ผ"
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "่‡ณๅฐ‘็™ผ็พไธ€ๅ€‹็„กๆ•ˆ็š„็ฐฝ็ซ ใ€‚"
 
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "็„กๆณ•ๅŸท่กŒ '%s' ไพ†้ฉ—่ญ‰็ฐฝ็ซ ๏ผˆgpgv ๆ˜ฏๅฆๅฎ‰่ฃไบ†๏ผŸ๏ผ‰"
 
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "ๅœจๅŸท่กŒ gpgv ๆ™‚็™ผ็”Ÿๆœช็Ÿฅ็š„้Œฏ่ชค"
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "ไปฅไธ‹็ฐฝๅ็„กๆ•ˆ๏ผš\n"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1484,7 +1497,7 @@ msgstr "็”ฑๆ–ผ็„กๆณ•ๅ–ๅพ—ๅฎƒๅ€‘็š„ๅ…ฌ้‘ฐ๏ผŒไปฅไธ‹็ฐฝ็ซ ็„กๆณ•้€ฒ่กŒ้ฉ—่ญ‰๏ผš\n"
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "็ฉบ็™ฝๆช”ไธๆœƒๆ˜ฏๆœ‰ๆ•ˆๅฅ—ไปถๆช”"
+msgstr ""
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1514,53 +1527,53 @@ msgstr "้€™ๅ€‹ HTTP ไผบๆœๅ™จ็š„็ฏ„ๅœๆ”ฏๆดๆœ‰ๅ•้กŒ"
 msgid "Unknown date format"
 msgstr "ๆœช็Ÿฅ็š„่ณ‡ๆ–™ๆ ผๅผ"
 
-#: methods/http.cc:818
+#: methods/http.cc:827
 msgid "Select failed"
 msgstr "้ธๆ“‡ๅคฑๆ•—"
 
-#: methods/http.cc:823
+#: methods/http.cc:832
 msgid "Connection timed out"
 msgstr "้€ฃ็ทš้€พๆ™‚"
 
-#: methods/http.cc:846
+#: methods/http.cc:855
 msgid "Error writing to output file"
 msgstr "ๅœจๅฏซๅ…ฅ่ผธๅ‡บๆช”ๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
 
-#: methods/http.cc:877
+#: methods/http.cc:886
 msgid "Error writing to file"
 msgstr "ๅœจๅฏซๅ…ฅๆช”ๆกˆๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
 
-#: methods/http.cc:905
+#: methods/http.cc:914
 msgid "Error writing to the file"
 msgstr "ๅœจๅฏซๅ…ฅ่ฉฒๆช”ๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
 
-#: methods/http.cc:919
+#: methods/http.cc:928
 msgid "Error reading from server. Remote end closed connection"
 msgstr "ๅœจ่ฎ€ๅ–ไผบๆœๅ™จๆ™‚็™ผ็”Ÿ้Œฏ่ชค๏ผŒ้ ็ซฏไธปๆฉŸๅทฒ้—œ้–‰้€ฃ็ทš"
 
-#: methods/http.cc:921
+#: methods/http.cc:930
 msgid "Error reading from server"
 msgstr "ๅœจ่ฎ€ๅ–ไผบๆœๅ™จๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
 
-#: methods/http.cc:1194
+#: methods/http.cc:1198
 msgid "Bad header data"
 msgstr "้Œฏ่ชค็š„ๆจ™้ ญ่ณ‡ๆ–™"
 
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
 msgid "Connection failed"
 msgstr "้€ฃ็ทšๅคฑๆ•—"
 
-#: methods/http.cc:1358
+#: methods/http.cc:1362
 msgid "Internal error"
 msgstr "ๅ…ง้ƒจ้Œฏ่ชค"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "็„กๆณ•่ฎ€ๅ– %s"
@@ -1587,7 +1600,12 @@ msgstr ""
 msgid "Can not read mirror file '%s'"
 msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ %s"
 
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ %s"
+
+#: methods/mirror.cc:445
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
@@ -1679,7 +1697,7 @@ msgstr ""
 "  -c=? ่ฎ€ๅ–ๆŒ‡ๅฎš็š„่จญๅฎšๆช”\n"
 "  -o=? ๆŒ‡ๅฎšไปปๆ„็š„่จญๅฎš้ธ้ …๏ผŒไพ‹ๅฆ‚:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
 #, c-format
 msgid "Unable to write to %s"
 msgstr "็„กๆณ•ๅฏซๅ…ฅ %s"
@@ -1822,8 +1840,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "็„กๆณ•้–‹ๅ•Ÿ DB ๆช” %s: %s"
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
 #, c-format
 msgid "Failed to stat %s"
 msgstr "็„กๆณ•ๅ–ๅพ— %s ็š„็‹€ๆ…‹"
@@ -1836,87 +1854,87 @@ msgstr "ๅฅ—ไปถๆช”ๆฒ’ๆœ‰ control ่จ˜้Œ„"
 msgid "Unable to get a cursor"
 msgstr "็„กๆณ•ๅ–ๅพ—้Šๆจ™"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "่ญฆๅ‘Š๏ผš็„กๆณ•่ฎ€ๅ–็›ฎ้Œ„ %s\n"
 
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "่ญฆๅ‘Š๏ผš็„กๆณ•ๅ–ๅพ— %s ็‹€ๆ…‹\n"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: "
 msgstr "้Œฏ่ชค๏ผš"
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
 msgid "W: "
 msgstr "่ญฆๅ‘Š๏ผš"
 
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
 msgid "E: Errors apply to file "
 msgstr "้Œฏ่ชค๏ผšๅฅ—็”จๅˆฐๆช”ๆกˆๆ™‚็™ผ็”Ÿ้Œฏ่ชค"
 
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "็„กๆณ•่งฃๆž %s"
 
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
 msgid "Tree walking failed"
 msgstr "็„กๆณ•่ตฐ่จช็›ฎ้Œ„ๆจน"
 
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
 #, c-format
 msgid "Failed to open %s"
 msgstr "็„กๆณ•้–‹ๅ•Ÿ %s"
 
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "็„กๆณ•่ฎ€ๅ–้€ฃ็ต %s"
 
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "็„กๆณ•็งป้™ค้€ฃ็ต %s"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ็„กๆณ•ๅฐ‡ %s ้€ฃ็ตๅˆฐ %s"
 
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " ้”ๅˆฐไบ† DeLink ็š„ไธŠ้™ %sBใ€‚\n"
 
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
 msgid "Archive had no package field"
 msgstr "ๅฅ—ไปถๆช”่ฃกๆฒ’ๆœ‰ๅฅ—ไปถ่ณ‡่จŠ"
 
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ๆฒ’ๆœ‰้‡ๆ–ฐๅฎš็พฉ้ …็›ฎ\n"
 
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ็š„็ถญ่ญท่€…ๆ˜ฏ %s๏ผŒ่€Œ้ž %s\n"
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ๆฒ’ๆœ‰ๅŽŸๅง‹็ขผ้‡ๆ–ฐๅฎš็พฉ้ …็›ฎ\n"
 
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ไนŸๆฒ’ๆœ‰ไบŒๅ…ƒ็ขผ้‡ๆ–ฐๅฎš็พฉ้ …็›ฎ\n"
@@ -1990,7 +2008,7 @@ msgstr "ๅœจ่จˆ็ฎ— MD5 ๆ™‚็„กๆณ•่ฎ€ๅ–ๅˆฐ่ณ‡ๆ–™"
 msgid "Problem unlinking %s"
 msgstr "ๅœจๅ–ๆถˆ %s ็š„้€ฃ็ตๆ™‚็™ผ็”Ÿๅ•้กŒ"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "็„กๆณ•ๅฐ‡ %s ๆ›ดๅ็‚บ %s"
@@ -2047,23 +2065,23 @@ msgstr ""
 "  -c=? ่ฎ€ๅ–ๆŒ‡ๅฎš็š„่จญๅฎšๆช”\n"
 "  -o=? ๆŒ‡ๅฎšไปปๆ„็š„่จญๅฎš้ธ้ …๏ผŒไพ‹ๅฆ‚:-o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
 msgid "Failed to create pipes"
 msgstr "็„กๆณ•ๅปบ็ซ‹็ฎก็ทš"
 
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
 msgstr "็„กๆณ•ๅŸท่กŒ gzip"
 
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
 msgid "Corrupted archive"
 msgstr "ๆๆฏ€็š„ๅฅ—ไปถๆช”"
 
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar checksum ๅคฑๆ•—๏ผŒๅฅ—ไปถๆช”ๅทฒๆๆฏ€"
 
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "ๆœช็Ÿฅ็š„ TAR ๆจ™้ ญ้กžๅž‹ %u๏ผŒๆˆๅ“ก %s"
@@ -2134,54 +2152,54 @@ msgstr "ๅฏซๅ…ฅๆช”ๆกˆ %s ๅคฑๆ•—"
 msgid "Failed to close file %s"
 msgstr "้—œ้–‰ๆช”ๆกˆ %s ๅคฑๆ•—"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
 #, c-format
 msgid "The path %s is too long"
 msgstr "่ทฏๅพ‘ %s ้Ž้•ท"
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "่งฃ้–‹ %s ่ถ…้Žไธ€ๆฌก"
 
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "่ทฏๅพ‘ %s ๅทฒ่ขซๆŠฝๆ›"
 
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ๆญคๅฅ—ไปถ่ฉฆๅœ–ๅฏซ่‡ณๆŠฝๆ›ๅพŒ็š„็›ฎๆจ™ %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
 msgid "The diversion path is too long"
 msgstr "่ฆ้€ฒ่กŒๆŠฝๆ›็š„่ทฏๅพ‘้Ž้•ท"
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "็›ฎ้Œ„ %s ๅทฒ็ถ“่ขซ้ž็›ฎ้Œ„็š„ๆช”ๆกˆๆ‰€ๅ–ไปฃ"
 
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
 msgid "Failed to locate node in its hash bucket"
 msgstr "ๅœจ้›œๆนŠ่กจไธญๆ‰พไธๅˆฐ็ฏ€้ปž"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
 msgid "The path is too long"
 msgstr "่ทฏๅพ‘้Ž้•ท"
 
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "ไปฅ็„ก็‰ˆๆœฌ็š„ %s ่ฆ†ๅฏซๅŽŸๅง‹ๅฅ—ไปถ"
 
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ๆช”ๆกˆ %s/%s ่ฆ†ๅฏซไบ†ๅฅ—ไปถ %s ไธญ็š„็›ธๅŒๆช”ๆกˆ"
 
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "็„กๆณ•ๅ–ๅพ— %s ็š„็‹€ๆ…‹"
@@ -2253,38 +2271,38 @@ msgstr ""
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
-msgstr "็„กๆณ•ๅขžๅŠ  MMap ไน‹ๅคงๅฐ๏ผŒๅ› ๅทฒๅˆฐ้” %lu ไฝๅ…ƒ็ต„ไน‹้™ๅˆถใ€‚"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr "็„กๆณ•ๅขžๅŠ  MMap ไน‹ๅคงๅฐ๏ผŒๅ› ่‡ชๅ‹•ๅขžๅŠ ๅคงๅฐๅทฒ็‚บ็”จๆˆถๅœ็”จใ€‚"
+msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%liๅคฉ%liๅฐๆ™‚%liๅˆ†%li็ง’"
+msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%liๅฐๆ™‚%liๅˆ†%li็ง’"
+msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
 #, c-format
 msgid "%limin %lis"
-msgstr "%liๅˆ†%li็ง’"
+msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
 #, c-format
 msgid "%lis"
-msgstr "%li็ง’"
+msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
 #, c-format
 msgid "Selection %s not found"
 msgstr "้ธ้ … %s ๆ‰พไธๅˆฐ"
@@ -2354,6 +2372,16 @@ msgstr "%c%s... ้Œฏ่ชค๏ผ"
 msgid "%c%s... Done"
 msgstr "%c%s... ๅฎŒๆˆ"
 
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... ๅฎŒๆˆ"
+
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
@@ -2414,114 +2442,120 @@ msgstr "็„กๆณ•ๅ–ๅพ— CD-ROM ็š„็‹€ๆ…‹"
 msgid "Problem closing the gzip file %s"
 msgstr "ๅœจ้—œ้–‰ๆช”ๆกˆๆ™‚็™ผ็”Ÿๅ•้กŒ"
 
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "ไธๅœจๅ”ฏ่ฎ€ๆช”ๆกˆ %s ไธŠไฝฟ็”จๆช”ๆกˆ้Ž–ๅฎš"
 
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "็„กๆณ•้–‹ๅ•Ÿ้Ž–ๅฎšๆช” %s"
 
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "ไธๅœจไปฅ nfs ๆŽ›่ผ‰็š„ๆช”ๆกˆ %s ไธŠไฝฟ็”จๆช”ๆกˆ้Ž–ๅฎš"
 
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
 #, c-format
 msgid "Could not get lock %s"
 msgstr "็„กๆณ•ๅฐ‡ %s ้Ž–ๅฎš"
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr "็„กๆณ•ๅปบ็ซ‹ๆช”ๆกˆๆธ…ๅ–ฎ๏ผŒๅ›  '%s' ไธฆ้ž็›ฎ้Œ„"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "็•ฅ้Ž '%2$s' ็›ฎ้Œ„็š„ '%1$s'๏ผŒๅ› ๅ…ถไธฆ้žๆ™ฎ้€šๆช”ๆกˆ"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr "็•ฅ้Ž '%2$s' ็›ฎ้Œ„็š„ '%1$s' ๆช”ๆกˆ๏ผŒๅ› ๅ…ถไธฆ็„กๆช”ๆกˆๅ‰ฏๆช”ๅ"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr "็•ฅ้Ž '%2$s' ็›ฎ้Œ„็š„ '%1$s' ๆช”ๆกˆ๏ผŒๅ› ๅ…ถๆช”ๆกˆๅ‰ฏๆช”ๅ็„กๆ•ˆ"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ๅญ็จ‹ๅบ %s ๆ”ถๅˆฐไธ€ๅ€‹่จ˜ๆ†ถ้ซ”้Œฏ่ชคใ€‚"
 
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ๅญ็จ‹ๅบ %s ๆ”ถๅˆฐไธ€ๅ€‹่จ˜ๆ†ถ้ซ”้Œฏ่ชคใ€‚"
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ๅญ็จ‹ๅบ %s ๅ‚ณๅ›ž้Œฏ่ชค็ขผ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ๅญ็จ‹ๅบ %s ไธ้ ๆœŸๅพ—็ตๆŸ"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Could not open file %s"
 msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "็„กๆณ•้–‹ๅ•Ÿ็ฎก็ทš็ตฆ %s ไฝฟ็”จ"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
 msgid "Failed to create subprocess IPC"
 msgstr "็„กๆณ•ๅปบ็ซ‹ๅญ็จ‹ๅบ IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
 msgid "Failed to exec compressor "
 msgstr "็„กๆณ•ๅŸท่กŒๅฃ“็ธฎ็จ‹ๅผ"
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "่ฎ€ๅ–๏ผŒไปๆœ‰ %lu ๆœช่ฎ€ไฝ†ๅทฒ็„ก็ฉบ้–“"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ๅฏซๅ…ฅ๏ผŒไปๆœ‰ %lu ๅพ…ๅฏซๅ…ฅไฝ†ๅทฒๆฒ’่พจๆณ•"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "ๅœจ้—œ้–‰ๆช”ๆกˆๆ™‚็™ผ็”Ÿๅ•้กŒ"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ๅœจๅŒๆญฅๆช”ๆกˆๆ™‚็™ผ็”Ÿๅ•้กŒ"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ๅœจๅˆช้™คๆช”ๆกˆๆ™‚็™ผ็”Ÿๅ•้กŒ"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
 msgid "Problem syncing the file"
 msgstr "ๅœจๅŒๆญฅๆช”ๆกˆๆ™‚็™ผ็”Ÿๅ•้กŒ"
 
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "ๆ”พๆฃ„ๅฎ‰่ฃใ€‚"
+
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ๆธ…็ฉบๅฅ—ไปถๅฟซๅ–"
@@ -2548,59 +2582,59 @@ msgstr "ๆœฌ APT ไธๆ”ฏๆด '%s' ็‰ˆๆœฌ็ณป็ตฑ"
 msgid "The package cache was built for a different architecture"
 msgstr "้€™ๅ€‹ๅฅ—ไปถๅฟซๅ–ๆ˜ฏ็”จๆ–ผๅฆไธ€็จฎๅนณๅฐ็š„"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Depends"
 msgstr "็›ธไพ้—œไฟ‚"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "PreDepends"
 msgstr "้ ๅ…ˆ็›ธไพ้—œไฟ‚"
 
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
 msgid "Suggests"
 msgstr "ๅปบ่ญฐ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Recommends"
 msgstr "ๆŽจ่–ฆ"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Conflicts"
 msgstr "่ก็ช"
 
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
 msgid "Replaces"
 msgstr "ๅ–ไปฃ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Obsoletes"
 msgstr "ๅปขๆฃ„"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Breaks"
 msgstr "ๆฏ€ๆ"
 
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
 msgid "Enhances"
-msgstr "ๅขž้€ฒ"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "important"
 msgstr "้‡่ฆ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "required"
 msgstr "ๅฟ…่ฆ"
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
 msgid "standard"
 msgstr "ๆจ™ๆบ–"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "optional"
 msgstr "ๆฌก่ฆ"
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
 msgid "extra"
 msgstr "้กๅค–"
 
@@ -2700,29 +2734,29 @@ msgstr "ๆญฃๅœจ้–‹ๅ•Ÿ %s"
 msgid "Line %u too long in source list %s."
 msgstr "ไพ†ๆบๅˆ—่กจ %2$s ไธญ็š„็ฌฌ %1$u ่กŒๅคช้•ทใ€‚"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ไพ†ๆบๅˆ—่กจ %2$s ไธญ็š„็ฌฌ %1$u ่กŒ็š„ๆ ผๅผ้Œฏ่ชค๏ผˆ้กžๅž‹๏ผ‰"
 
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ๆœช็Ÿฅ็š„้กžๅž‹ '%1$s'๏ผŒไฝๆ–ผๅœจไพ†ๆบๅˆ—่กจ %3$s ไธญ็š„็ฌฌ %2$u ่กŒ"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ %s"
 
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2743,7 +2777,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "ๅฅ—ไปถ %s ้œ€่ฆ้‡ๆ–ฐๅฎ‰่ฃ๏ผŒไฝ†ๆ‰พไธๅˆฐๅฎƒ็š„ๅฅ—ไปถๆช”ใ€‚"
 
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2751,18 +2785,18 @@ msgstr ""
 "้Œฏ่ชค๏ผŒpkgProblemResolver::Resolve ็š„ๅปบ็ซ‹ไธญๆ–ทไบ†๏ผŒ้€™ๅฏ่ƒฝ่‚‡ๅ› ๆ–ผไฟ็•™ (hold) ๅฅ—"
 "ไปถใ€‚"
 
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "็„กๆณ•ไฟฎๆญฃๅ•้กŒ๏ผŒๆ‚จไฟ็•™ (hold) ไบ†ๆๆฏ€็š„ๅฅ—ไปถใ€‚"
 
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr "ๆœ‰ไธ€ไบ›็ดขๅผ•ๆช”ไธ่ƒฝไธ‹่ผ‰๏ผŒๅฎƒๅ€‘ๅฏ่ƒฝ่ขซ็•ฅ้Žไบ†๏ผŒๆˆ–ๆ˜ฏๆ›ฟ่€Œไฝฟ็”จๅŽŸๆœ‰็š„็ดขๅผ•ๆช”ใ€‚"
 
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "ๆ‰พไธๅˆฐๆธ…ๅ–ฎ็›ฎ้Œ„ %spartialใ€‚"
@@ -2799,17 +2833,17 @@ msgstr "ๆ‰พไธๅˆฐๅฎ‰่ฃๆ–นๅผ็š„้ฉ…ๅ‹•็จ‹ๅผ %sใ€‚"
 msgid "Method %s did not start correctly"
 msgstr "ๅฎ‰่ฃๆ–นๅผ %s ๆฒ’ๆœ‰ๆญฃ็ขบๅ•Ÿๅ‹•"
 
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "่ซ‹ๆŠŠๆจ™็ฑค็‚บ '%s' ็š„ๅ…‰็ขŸๆ”พๅ…ฅ '%s' ่ฃ็ฝฎไธญ๏ผŒ็„ถๅพŒๆŒ‰ไธ‹ [Enter] ้ตใ€‚"
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ไธๆ”ฏๆด็š„ๅฅ—ไปถๅŒ…่ฃ็ณป็ตฑ '%s'"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "็„กๆณ•็ขบ่ชๅˆ้ฉ็š„ๅฅ—ไปถๅŒ…่ฃ็ณป็ตฑ้กžๅž‹"
 
@@ -2862,14 +2896,14 @@ msgstr "ๅฟซๅ–ไฝฟ็”จ็š„ๆ˜ฏไธ็›ธๅฎน็š„็‰ˆๆœฌ็ณป็ตฑ"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "ๅœจ่™•็† %s ๆ™‚็™ผ็”Ÿ้Œฏ่ชค (FindPkg)"
@@ -2890,26 +2924,26 @@ msgstr "ๅ“‡ๅ‘€๏ผŒๆ‚จๅทฒ็ถ“่ถ…้Ž้€™ๅ€‹ APT ๆ‰€่ƒฝ่™•็†็š„่ชชๆ˜Žๆ•ธ้‡ไบ†ใ€‚"
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "ๅ“‡ๅ‘€๏ผŒๆ‚จๅทฒ็ถ“่ถ…้Ž้€™ๅ€‹ APT ๆ‰€่ƒฝ่™•็†็š„็›ธไพ้—œไฟ‚ๆ•ธ้‡ไบ†ใ€‚"
 
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ๅœจ่จˆ็ฎ—ๆช”ๆกˆ็›ธไพๆ€งๆ™‚ๆ‰พไธๅˆฐๅฅ—ไปถ %s %s"
 
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "็„กๆณ•ๅ–ๅพ—ไพ†ๆบๅฅ—ไปถๅˆ—่กจ %s ็š„็‹€ๆ…‹"
 
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
 msgid "Reading package lists"
 msgstr "ๆญฃๅœจ่ฎ€ๅ–ๅฅ—ไปถๆธ…ๅ–ฎ"
 
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
 msgid "Collecting File Provides"
 msgstr "ๆญฃๅœจๆ”ถ้›†ๆช”ๆกˆๆไพ›่€…"
 
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
 msgid "IO Error saving source cache"
 msgstr "ๅœจๅ„ฒๅญ˜ไพ†ๆบๅฟซๅ–ๆ™‚ IO ้Œฏ่ชค"
 
@@ -2922,53 +2956,53 @@ msgstr "็„กๆณ•้‡ๆ–ฐๅ‘ฝๅ๏ผŒ%s (%s -> %s)ใ€‚"
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ไธ็ฌฆ"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum ไธ็ฌฆ"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "็„กๆณ•่พจๅˆฅ Release ๆช” %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "็„กๆณ•ๅ–ๅพ—ไปฅไธ‹็š„ๅฏ†้‘ฐ ID ็š„ๅ…ฌ้‘ฐ๏ผš\n"
 
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "็™ผ่กŒ็‰ˆๆœฌ่ก็ช๏ผš%s๏ผˆๆ‡‰็•ถๆ˜ฏ %s ไฝ†ๅปๅพ—ๅˆฐ %s๏ผ‰"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
 #, c-format
 msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr "GPG ้Œฏ่ชค: %s: %s"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2977,44 +3011,44 @@ msgstr ""
 "ๆ‰พไธๅˆฐ %s ๅฅ—ไปถ็š„ๆŸๅ€‹ๆช”ๆกˆใ€‚้€™ๆ„ๅ‘ณ่‘—ๆ‚จๅฏ่ƒฝ่ฆๆ‰‹ๅ‹•ไฟฎๅพฉ้€™ๅ€‹ๅฅ—ไปถใ€‚๏ผˆๅ› ็‚บๆ‰พไธๅˆฐๅนณ"
 "ๅฐ๏ผ‰"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr "ๆ‰พไธๅˆฐ %s ๅฅ—ไปถ็š„ๆŸๅ€‹ๆช”ๆกˆใ€‚้€™ๆ„ๅ‘ณ่‘—ๆ‚จๅฏ่ƒฝ่ฆๆ‰‹ๅ‹•ไฟฎๅพฉ้€™ๅ€‹ๅฅ—ไปถใ€‚"
 
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "้€™ๅ€‹ๅฅ—ไปถ็š„็ดขๅผ•ๆช”ๆๅฃžไบ†ใ€‚ๆฒ’ๆœ‰ๅฅ—ไปถ %s ็š„ Filename: ๆฌ„ไฝใ€‚"
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
 msgid "Size mismatch"
 msgstr "ๅคงๅฐไธ็ฌฆ"
 
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "็„กๆณ•่พจๅˆฅ Release ๆช” %s"
 
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "ๅœจ Release ๆช” %s ่ฃกๆฒ’ๆœ‰ๅ€ๆฎต"
 
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "ๅœจ Release ๆช” %s ่ฃกๆฒ’ๆœ‰ Hash ้ …็›ฎ"
 
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ๅœจ Release ๆช” %s ่ฃกๆฒ’ๆœ‰ Hash ้ …็›ฎ"
 
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ๅœจ Release ๆช” %s ่ฃกๆฒ’ๆœ‰ Hash ้ …็›ฎ"
@@ -3042,7 +3076,7 @@ msgstr "ๆญฃๅœจ่ญ˜ๅˆฅ.."
 msgid "Stored label: %s\n"
 msgstr "ไฟๅญ˜ๆจ™็ฑค๏ผš%s\n"
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
 msgid "Unmounting CD-ROM...\n"
 msgstr "ๆญฃๅœจๅธ่ผ‰ๅ…‰็ขŸๆฉŸ...\n"
 
@@ -3078,7 +3112,7 @@ msgstr "ๆ‰พๅˆฐไบ† %zu ๅ€‹ๅฅ—ไปถ็ดขๅผ•๏ผŒ%zu ๅ€‹ๅŽŸๅง‹็ขผ็ดขๅผ•๏ผŒ%zu ๅ€‹็ฟป่ญฏ็ด
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
-msgstr "ๆ‰พไธๅˆฐๅฅ—ไปถๆช”๏ผŒๅฏ่ƒฝๆญคไธฆ้ž Debian ๅ…‰็ขŸๆˆ–ๅนณๅฐไธๅฐ๏ผŸ"
+msgstr ""
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
@@ -3102,30 +3136,30 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "ๆญฃๅœจ่ค‡่ฃฝๅฅ—ไปถๆธ…ๅ–ฎ..."
 
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
 msgid "Writing new source list\n"
 msgstr "ๆญฃๅœจๅฏซๅ…ฅๆ–ฐ็š„ไพ†ๆบๅˆ—่กจ\n"
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
 msgid "Source list entries for this disc are:\n"
 msgstr "่ฉฒ็ขŸ็‰‡็š„ไพ†ๆบๅˆ—่กจ้ …็›ฎ็‚บ๏ผš\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "ๅฏซๅ…ฅ %i ็ญ†็ด€้Œ„ใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "ๅฏซๅ…ฅ %i ็ญ†็ด€็ถ ๏ผŒๅ…ถไธญๆœ‰ %i ๅ€‹ๆช”ๆกˆ้บๅคฑไบ†ใ€‚\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "ๅฏซๅ…ฅ %i ็ญ†็ด€็ถ ๏ผŒๅ…ถไธญๆœ‰ %i ๅ€‹ๆช”ๆกˆไธ็ฌฆ\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "ๅฏซๅ…ฅ %i ็ญ†็ด€็ถ ๏ผŒๅ…ถไธญๆœ‰ %i ๅ€‹ๆช”ๆกˆ้บๅคฑไบ†๏ผŒๆœ‰ %i ๅ€‹ๆช”ๆกˆไธ็ฌฆ\n"
@@ -3140,17 +3174,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum ไธ็ฌฆ"
 
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "ๆ”พๆฃ„ๅฎ‰่ฃใ€‚"
-
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -3174,7 +3197,7 @@ msgstr "็„กๆณ•ๆ‰พๅˆฐๅฅ—ไปถ %s"
 #: apt-pkg/cacheset.cc:534
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "็„กๆณ•้ธๅ– %s ๅฅ—ไปถ็š„็‰ˆๆœฌ๏ผŒๅ› ๅ…ถ็‚บ็ด”่™›ๆ“ฌๅฅ—ไปถ"
+msgstr ""
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3214,119 +3237,119 @@ msgstr ""
 msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "ๆญฃๅœจๅฎ‰่ฃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "ๆญฃๅœจ่จญๅฎš %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "ๆญฃๅœจ็งป้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "ๅทฒๅฎŒๆ•ด็งป้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr "ๅ‰›ๆณจๆ„ๅˆฐ %s ๆถˆๅคฑ"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "ๆญฃๅœจๅŸท่กŒๅฎ‰่ฃๅพŒๅฅ—ไปถๅพŒ็บŒ่™•็†็จ‹ๅผ %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ๆ‰พไธๅˆฐ '%s' ็›ฎ้Œ„"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "็„กๆณ•้–‹ๅ•Ÿๆช”ๆกˆ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "ๆญฃๅœจๆบ–ๅ‚™ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "ๆญฃๅœจ่งฃ้–‹ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "ๆญฃๅœจๆบ–ๅ‚™่จญๅฎš %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "ๅทฒๅฎ‰่ฃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "ๆญฃๅœจๆบ–ๅ‚™็งป้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "ๅทฒ็งป้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "ๆญฃๅœจๆบ–ๅ‚™ๅฎŒๆ•ด็งป้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "ๅทฒๅฎŒๆ•ด็งป้™ค %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "็„กๆณ•ๅฏซๅ…ฅ่จ˜้Œ„ๆช”๏ผŒopenpty() ๅคฑๆ•—๏ผˆ/dev/pts ๆœชๆŽ›่ผ‰๏ผŸ๏ผ‰\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
-msgstr "ๅŸท่กŒ dpkg"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
-msgstr "ไพๅญ˜้—œไฟ‚ๅ•้กŒ - ็ถญๆŒ็‚บๆœช่จญๅฎš"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3338,13 +3361,7 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3367,19 +3384,11 @@ msgstr "็„กๆณ•้Ž–ๅฎšๅˆ—่กจ็›ฎ้Œ„"
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg ไฝœๆฅญ้ญไธญๆ–ท๏ผŒๅฟ…้ ˆๆ‰‹ๅ‹•ๅŸท่กŒ '%s' ไปฅไฟฎๆญฃๅ•้กŒใ€‚ "
+msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
-msgstr "ๆœช้Ž–ๅฎš"
-
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "ๅœจ่งฃๆž '%s:%s' (%i) ๆ™‚ๅ‡บไบ†ๆ€ชไบ‹"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... ๅฎŒๆˆ"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Skipping nonexistent file %s"
diff --git a/test/integration/Packages-pdiff-usage b/test/integration/Packages-pdiff-usage
index d1530a95c..ac962f29a 100644
--- a/test/integration/Packages-pdiff-usage
+++ b/test/integration/Packages-pdiff-usage
@@ -19,6 +19,7 @@ Description: Advanced front-end for dpkg
  .
  APT features complete installation ordering, multiple source capability
  and several other unique features, see the Users Guide in apt-doc.
+Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
 
 Package: oldstuff
 Version: 1.0
@@ -32,3 +33,4 @@ SHA1: 3c695e028f74d5c544deeddaaa1242desa81088c
 SHA256: b46fd1546151c545fe4bfa56a5cc0e7deaef23e2da3e4f129727fd660f28f050
 Description: some cool but old stuff
  This package will disappear in the next mirror update
+Description-md5: 1948af60eda0a41dfa9fe83f60eb8389
diff --git a/test/integration/Packages-pdiff-usage-new b/test/integration/Packages-pdiff-usage-new
index 4f374b37f..f8d7b1958 100644
--- a/test/integration/Packages-pdiff-usage-new
+++ b/test/integration/Packages-pdiff-usage-new
@@ -22,6 +22,7 @@ Description: Advanced front-end for dpkg
  .
  APT features complete installation ordering, multiple source capability
  and several other unique features, see the Users Guide in apt-doc.
+Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
 
 Package: newstuff
 Version: 1.0
@@ -35,3 +36,4 @@ SHA1: 3c695e028f7a1ae324deeddaaa1242desa81088c
 SHA256: b46fd154615edefab321cc56a5cc0e7deaef23e2da3e4f129727fd660f28f050
 Description: some cool and shiny new stuff
  This package will appear in the next mirror update
+Description-md5: d5f89fbbc2ac69c43d7e4c9b67d82b6b
diff --git a/test/integration/Packages-releasefile-verification b/test/integration/Packages-releasefile-verification
index 29a385f4f..eb7327279 100644
--- a/test/integration/Packages-releasefile-verification
+++ b/test/integration/Packages-releasefile-verification
@@ -16,3 +16,4 @@ Description: Advanced front-end for dpkg
  .
  APT features complete installation ordering, multiple source capability
  and several other unique features, see the Users Guide in apt-doc.
+Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
diff --git a/test/integration/Packages-releasefile-verification-new b/test/integration/Packages-releasefile-verification-new
index e3b2edf1f..61509d157 100644
--- a/test/integration/Packages-releasefile-verification-new
+++ b/test/integration/Packages-releasefile-verification-new
@@ -19,3 +19,4 @@ Description: Advanced front-end for dpkg
  .
  APT features complete installation ordering, multiple source capability
  and several other unique features, see the Users Guide in apt-doc.
+Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
diff --git a/test/integration/framework b/test/integration/framework
index 9b01c3161..7dd7c20a7 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -38,7 +38,11 @@ msgtest() {
 }
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
-msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
+msgfail() {
+	if [ $# -gt 0 ]; then echo "${CFAIL}FAIL: $*${CNORMAL}" >&2;
+	else echo "${CFAIL}FAIL${CNORMAL}" >&2; fi
+	EXIT_CODE=$((EXIT_CODE+1));
+}
 
 # enable / disable Debugging
 MSGLEVEL=${MSGLEVEL:-3}
@@ -56,9 +60,9 @@ if [ $MSGLEVEL -le 2 ]; then
 	msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; }
 	msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; }
 	if [ -n "$CFAIL" ]; then
-		msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; }
+		msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
 	else
-		msgfail() { echo -n " ###FAILED###" >&2; }
+		msgfail() { echo -n " ###FAILED###" >&2; EXIT_CODE=$((EXIT_CODE+1)); }
 	fi
 fi
 if [ $MSGLEVEL -le 3 ]; then
@@ -114,6 +118,9 @@ gdb() {
 	echo "gdb: run ยป$*ยซ"
 	APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1
 }
+http() {
+	LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http
+}
 
 exitwithstatus() {
         # error if we about to overflow, but ...
@@ -125,7 +132,11 @@ exitwithstatus() {
 }
 
 addtrap() {
-	CURRENTTRAP="$CURRENTTRAP $1"
+	if [ "$1" = 'prefix' ]; then
+		CURRENTTRAP="$2 $CURRENTTRAP"
+	else
+		CURRENTTRAP="$CURRENTTRAP $1"
+	fi
 	trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 }
 
@@ -135,8 +146,7 @@ setupenvironment() {
 	msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}โ€ฆ "
 	BUILDDIRECTORY="${TESTDIRECTORY}/../../build/bin"
 	test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
-	local OLDWORKINGDIRECTORY=$(pwd)
-	addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY;"
+	addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY;"
 	cd $TMPWORKINGDIRECTORY
 	mkdir rootdir aptarchive keys
 	cd rootdir
@@ -483,6 +493,7 @@ insertpackage() {
 	local VERSION="$4"
 	local DEPENDENCIES="$5"
 	local PRIORITY="${6:-optional}"
+	local DESCRIPTION="${7}"
 	local ARCHS=""
 	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
 		if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
@@ -504,11 +515,16 @@ Maintainer: Joe Sixpack <joe@example.org>" >> $FILE
 			echo "Version: $VERSION
 Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
 			test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
-			echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+			echo -n 'Description: ' >> $FILE
+			if [ -z "$DESCRIPTION" ]; then
+				echo "an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
- und used only by testcases for APT and surf no other proposeโ€ฆ
-" >> $FILE
+ und used only by testcases for APT and surf no other proposeโ€ฆ" >> $FILE
+			else
+				echo "$DESCRIPTION" >> $FILE
+			fi
+			echo >> $FILE
 		done
 	done
 }
@@ -589,9 +605,12 @@ buildaptarchivefromfiles() {
 		cat ${line} | bzip2 > ${line}.bz2
 		cat ${line} | xz --format=lzma > ${line}.lzma
 		cat ${line} | xz > ${line}.xz
+		if [ -n "$1" ]; then
+			touch -d "$1" ${line}.gz ${line}.bz2 ${line}.lzma ${line}.xz
+		fi
 		msgdone "info"
 	done
-	generatereleasefiles
+	generatereleasefiles "$@"
 }
 
 # can be overridden by testcases for their pleasure
@@ -683,9 +702,11 @@ setupaptarchive() {
 		setupflataptarchive
 	fi
 	signreleasefiles
-	msgninfo "\tSync APT's cache with the archiveโ€ฆ "
-	aptget update -qq
-	msgdone "info"
+	if [ "$1" != '--no-update' ]; then
+		msgninfo "\tSync APT's cache with the archiveโ€ฆ "
+		aptget update -qq
+		msgdone "info"
+	fi
 }
 
 signreleasefiles() {
@@ -701,40 +722,44 @@ signreleasefiles() {
 	done
 	for RELEASE in $(find aptarchive/ -name Release); do
 		gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" -abs -o ${RELEASE}.gpg ${RELEASE}
-		gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" --clearsign -o "$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')" $RELEASE
+		local INRELEASE="$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')"
+		gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" --clearsign -o $INRELEASE $RELEASE
+		# we might have set a specific date for the Release file, so copy it
+		touch -d "$(stat --format "%y" ${RELEASE})" ${RELEASE}.gpg ${INRELEASE}
 	done
 	msgdone "info"
 }
 
 changetowebserver() {
-	if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
-		msgdie 'Need the aptwebserver when passing arguments'
-	fi
-
 	local LOG='/dev/null'
 	if test -x ${BUILDDIRECTORY}/aptwebserver; then
 		cd aptarchive
-		LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> $LOG > $LOG &
-		addtrap "kill $!;"
+		LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1
+		local PID="$(cat aptwebserver.pid)"
+		if [ -z "$PID" ]; then
+			msgdie 'Could not fork aptwebserver successfully'
+		fi
+		addtrap "kill $PID;"
 		cd - > /dev/null
+	elif [ $# -gt 0 ]; then
+		msgdie 'Need the aptwebserver when passing arguments for the webserver'
 	elif which weborf > /dev/null; then
-		weborf -xb aptarchive/ 2> $LOG > $LOG &
+		weborf -xb aptarchive/ >$LOG 2>&1 &
 		addtrap "kill $!;"
 	elif which gatling > /dev/null; then
 		cd aptarchive
-		gatling -p 8080 -F -S 2> $LOG > $LOG &
+		gatling -p 8080 -F -S >$LOG 2>&1 &
 		addtrap "kill $!;"
 		cd - > /dev/null
 	elif which lighttpd > /dev/null; then
 		echo "server.document-root = \"$(readlink -f ./aptarchive)\"
 server.port = 8080
 server.stat-cache-engine = \"disable\"" > lighttpd.conf
-		lighttpd -t -f lighttpd.conf 2> $LOG > $LOG || msgdie 'Can not change to webserver: our lighttpd config is invalid'
-		lighttpd -D -f lighttpd.conf 2> $LOG > $LOG &
+		lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
+		lighttpd -D -f lighttpd.conf >$LOG 2>&1 &
 		addtrap "kill $!;"
 	else
-		msgdie 'You have to install weborf or lighttpd first'
-		return 1
+		msgdie 'You have to build aptwerbserver or install a webserver'
 	fi
 	local APTARCHIVE="file://$(readlink -f ./aptarchive)"
 	for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
diff --git a/test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch b/test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch
new file mode 100755
index 000000000..9e683b5b9
--- /dev/null
+++ b/test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+buildsimplenativepackage 'testing' 'amd64,i386' '0.8.15' 'stable' 'Depends: libtest'
+buildsimplenativepackage 'libtest' 'amd64,i386' '0.8.15' 'stable' 'Multi-Arch: same'
+buildsimplenativepackage 'libtest' 'amd64,i386' '1' 'unstable' 'Multi-Arch: same'
+
+# needed by the ftparchive.conf
+cd aptarchive
+ln -s ../incoming pool
+createaptftparchiveconfig
+cd - >/dev/null
+# create an amd64 cdrom
+sed -i 's#Architectures .*$#Architectures "amd64 source";#' aptarchive/ftparchive.conf
+setupaptarchive --no-update
+changetocdrom 'Debian APT Testdisk amd64 0.8.15'
+mv rootdir/media/cdrom rootdir/media/cdrom-amd64
+addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom-amd64/dists/;"
+chmod -R -w rootdir/media/cdrom-amd64/dists
+ln -s $PWD/rootdir/media/cdrom-amd64 $PWD/rootdir/media/cdrom
+aptcdrom add -m -o quiet=1
+rm $PWD/rootdir/media/cdrom
+# do it again to create a i386 cdrom
+sed -i 's#Architectures .*$#Architectures "i386 source";#' aptarchive/ftparchive.conf
+setupaptarchive --no-update
+changetocdrom 'Debian APT Testdisk i386 0.8.15'
+mv rootdir/media/cdrom rootdir/media/cdrom-i386
+addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom-i386/dists/;"
+chmod -R -w rootdir/media/cdrom-i386/dists
+ln -s $PWD/rootdir/media/cdrom-i386 $PWD/rootdir/media/cdrom
+aptcdrom add -m -o quiet=1
+
+# play with the cdroms
+testdpkgnotinstalled testing
+aptget install testing -t stable -y #> /dev/null 2>&1
+testdpkginstalled testing
+
+testdpkgnotinstalled testing:i386
+aptget install testing:i386 -t stable -y #> /dev/null 2>&1
+testdpkginstalled testing:i386
+
+aptget dist-upgrade -y
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index f1c4fd9d3..6e3533152 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -7,7 +7,7 @@ setupenvironment
 configarchitecture 'amd64' 'i386'
 
 buildsimplenativepackage 'testing' 'amd64,i386' '0.8.15' 'stable'
-setupaptarchive
+setupaptarchive --no-update
 
 changetocdrom 'Debian APT Testdisk 0.8.15'
 
@@ -24,7 +24,7 @@ cat Translation-de | xz --format=lzma > Translation-de.lzma
 cat Translation-de | xz > Translation-de.xz
 rm Translation-en Translation-de
 cd - > /dev/null
-addtrap "chmod -R +w $PWD/rootdir/media/cdrom/dists/;"
+addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom/dists/;"
 chmod -R -w rootdir/media/cdrom/dists
 
 aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1
diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index e0dd7737f..0ce4c1413 100755
--- a/test/integration/test-bug-590041-prefer-non-virtual-packages
+++ b/test/integration/test-bug-590041-prefer-non-virtual-packages
@@ -9,6 +9,7 @@ pkglibc6="Package: libc6
 Architecture: armel
 Version: 2.11.2-2~0.3
 Description: Embedded GNU C Library: Shared libraries
+Description-md5: b8c1e0561b75e2dc6b6482a99079c3e4
 Filename: pool/main/e/eglibc/libc6_2.11.2-2_armel.deb
 Installed-Size: 9740
 MD5sum: f5b878ce5fb8aa01a7927fa1460df537
@@ -25,6 +26,7 @@ Architecture: i386
 Version: 2.1.3-13~0.3
 Replaces: libc6 (<< 2.2.5-13~0.3)
 Description: The Berkeley database routines [glibc 2.0/2.1 compatibility]
+Description-md5: de1876f7fe7f7709a110875e145e38a8
 Filename: pool/main/d/db1-compat/libdb1-compat_2.1.3-13_armel.deb
 Installed-Size: 136
 MD5sum: 4043f176ab2b40b0c01bc1211b8c103c
diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 4611b8b8e..a05ed5fa6 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -103,23 +103,23 @@ testoverhttp() {
 	setupcompressor "$1"
 
 	createemptyfile 'en'
-	testaptgetupdate "Get: http://localhost  Packages []
-Get: http://localhost  Translation-en
+	testaptgetupdate "Get: http://localhost:8080  Packages []
+Get: http://localhost:8080  Translation-en
 Reading package lists..." "empty file en.$COMPRESS over http"
 
 	createemptyarchive 'en'
-	testaptgetupdate "Get: http://localhost  Packages []
-Get: http://localhost  Translation-en []
+	testaptgetupdate "Get: http://localhost:8080  Packages []
+Get: http://localhost:8080  Translation-en []
 Reading package lists..." "empty archive en.$COMPRESS over http"
 
 	createemptyarchive 'Packages'
-	testaptgetupdate "Get: http://localhost  Packages []
+	testaptgetupdate "Get: http://localhost:8080  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
 	createemptyfile 'Packages'
 	#FIXME: we should response with a good error message instead
-	testaptgetupdate "Get: http://localhost  Packages
-Err http://localhost  Packages
+	testaptgetupdate "Get: http://localhost:8080  Packages
+Err http://localhost:8080  Packages
   Empty files can't be valid archives
 W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages)  Empty files can't be valid archives
 
diff --git a/test/integration/test-bug-601016-description-translation b/test/integration/test-bug-601016-description-translation
index 03fddbfda..33c209e9d 100755
--- a/test/integration/test-bug-601016-description-translation
+++ b/test/integration/test-bug-601016-description-translation
@@ -9,8 +9,9 @@ configarchitecture 'i386' 'amd64'
 # we need a valid locale here, otherwise the language configuration
 # will be overridden by LC_ALL=C
 LOCALE="$(echo "$LANG" | cut -d'_' -f 1)"
+MD5Sum='Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c'
 
-PACKAGESTANZA="Package: apt
+PACKAGESTANZA='Package: apt
 Priority: important
 Section: admin
 Installed-Size: 5984
@@ -19,8 +20,7 @@ Architecture: i386
 Version: 0.8.7
 Filename: pool/main/a/apt/apt_0.8.7_i386.deb
 Size: 2140230
-MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08
-Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c"
+MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08'
 
 PACKAGESTANZA2='Package: apt
 Priority: important
@@ -31,22 +31,23 @@ Architecture: amd64
 Version: 0.8.7
 Filename: pool/main/a/apt/apt_0.8.7_amd64.deb
 Size: 2210342
-MD5sum: 4a869bfbdef9ebc9fa74f7a5271e8d1a
-Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c'
+MD5sum: 4a869bfbdef9ebc9fa74f7a5271e8d1a'
 
 echo "$PACKAGESTANZA
 Description: Advanced front-end for dpkg
+$MD5Sum
 
 $PACKAGESTANZA2
-Description: Advanced front-end for dpkg" > aptarchive/Packages
+Description: Advanced front-end for dpkg
+$MD5Sum" > aptarchive/Packages
 
 echo "Package: apt
-Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
 Description-${LOCALE}: Mรคchtige Oberflรคche fรผr dpkg
  Das Paket bietet dem Nutzer technisch fรผhrende Methoden fรผr den Zugriff
  auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die
  APT-Dselect-Methode. Beides sind einfache und sicherere Wege,
- um Pakete zu installieren und Upgrades durchzufรผhren." | bzip2 > aptarchive/${LOCALE}.bz2
+ um Pakete zu installieren und Upgrades durchzufรผhren.
+$MD5Sum" | bzip2 > aptarchive/${LOCALE}.bz2
 
 # the $LOCALE translation file will not be included as it is a flat archive it came from and therefore
 # its name can not be guessed correctlyโ€ฆ (in non-flat archives the files are called Translation-*)
@@ -54,10 +55,12 @@ echo 'APT::Cache::Generate "false";' > rootdir/etc/apt/apt.conf.d/00nogenerate
 
 NOLONGSTANZA="$PACKAGESTANZA
 Description: Advanced front-end for dpkg
+$MD5Sum
 "
 
 ENGLISHSTANZA="$PACKAGESTANZA
 Description: Advanced front-end for dpkg
+$MD5Sum
 "
 
 LOCALESTANZA="$PACKAGESTANZA
@@ -66,6 +69,7 @@ Description-${LOCALE}: Mรคchtige Oberflรคche fรผr dpkg
  auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die
  APT-Dselect-Methode. Beides sind einfache und sicherere Wege,
  um Pakete zu installieren und Upgrades durchzufรผhren.
+$MD5Sum
 "
 LOCALESTANZA2="$PACKAGESTANZA2
 Description-${LOCALE}: Mรคchtige Oberflรคche fรผr dpkg
@@ -73,6 +77,7 @@ Description-${LOCALE}: Mรคchtige Oberflรคche fรผr dpkg
  auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die
  APT-Dselect-Methode. Beides sind einfache und sicherere Wege,
  um Pakete zu installieren und Upgrades durchzufรผhren.
+$MD5Sum
 "
 
 testrun() {
@@ -97,28 +102,32 @@ testrun
 
 echo "$PACKAGESTANZA
 Description: Advanced front-end for dpkg
+$MD5Sum
 
 $PACKAGESTANZA2
-Description: Advanced front-end for dpkg" > aptarchive/Packages
+Description: Advanced front-end for dpkg
+$MD5Sum" > aptarchive/Packages
 
 echo "Package: apt
-Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
 Description-en: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a
- simpler, safer way to install and upgrade packages." | bzip2 > aptarchive/en.bz2
+ simpler, safer way to install and upgrade packages.
+$MD5Sum" | bzip2 > aptarchive/en.bz2
 
 ENGLISHSTANZA="$PACKAGESTANZA
 Description-en: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a
  simpler, safer way to install and upgrade packages.
+$MD5Sum
 "
 ENGLISHSTANZA2="$PACKAGESTANZA2
 Description-en: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a
  simpler, safer way to install and upgrade packages.
+$MD5Sum
 "
 
 testrun
diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index 43ecda867..c20443559 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -19,12 +19,11 @@ msgtest 'Test redirection works in' 'apt-get update'
 aptget update -qq && msgpass || msgfail
 
 # check that I-M-S header is kept in redirections
-testequal 'Hit http://localhost unstable Release.gpg
-Hit http://localhost unstable Release
-Hit http://localhost unstable/main Sources
-Hit http://localhost unstable/main amd64 Packages
-Hit http://localhost unstable/main Translation-en
-Reading package lists...' aptget update
+testequal 'Hit http://localhost:8080 unstable InRelease
+Hit http://localhost:8080 unstable/main Sources
+Hit http://localhost:8080 unstable/main amd64 Packages
+Hit http://localhost:8080 unstable/main Translation-en
+Reading package lists...' aptget update #-o debug::pkgacquire=1 -o debug::pkgacquire::worker=1
 
 msgtest 'Test redirection works in' 'package download'
 aptget install unrelated --download-only -qq && msgpass || msgfail
diff --git a/test/integration/test-bug-691453-apt-cache-search-multi-pattern b/test/integration/test-bug-691453-apt-cache-search-multi-pattern
new file mode 100755
index 000000000..0367892fc
--- /dev/null
+++ b/test/integration/test-bug-691453-apt-cache-search-multi-pattern
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'native'
+
+insertpackage 'unstable' 'foobar' 'native' '1' '' '' 'funky tool'
+insertpackage 'unstable' 'coolstuff' 'native' '1' '' '' 'funky tool just like foo and bar'
+insertpackage 'unstable' 'foo' 'native' '1' '' '' 'tool best used with bar'
+insertpackage 'unstable' 'bar' 'native' '1' '' '' 'tool best used with foo'
+insertpackage 'unstable' 'baz' 'native' '1' 'Provides: bar' '' 'alternative tool best used with foo'
+
+setupaptarchive
+
+# in this special case the following queries should be equal
+FOOBAR='foobar - funky tool
+coolstuff - funky tool just like foo and bar
+foo - tool best used with bar
+bar - tool best used with foo
+baz - alternative tool best used with foo'
+
+testequal "$FOOBAR" aptcache search foo
+testequal "$FOOBAR" aptcache search bar
+testequal "$FOOBAR" aptcache search foo bar
+
+testequal 'foobar - funky tool
+foo - tool best used with bar' aptcache search -n foo
+testequal 'foobar - funky tool
+bar - tool best used with foo
+baz - alternative tool best used with foo' aptcache search -n bar
+testequal 'foobar - funky tool' aptcache search -n foo bar
diff --git a/test/integration/test-bug-712435-missing-descriptions b/test/integration/test-bug-712435-missing-descriptions
new file mode 100755
index 000000000..9b3c2ee50
--- /dev/null
+++ b/test/integration/test-bug-712435-missing-descriptions
@@ -0,0 +1,89 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+PACKAGESTANZA='Version: 0.9.7.8
+Installed-Size: 3270
+Maintainer: APT Development Team <deity@lists.debian.org>
+Architecture: amd64
+Filename: pool/main/a/apt/apt_0.9.7.8_amd64.deb
+MD5sum: 3a622acda41620df50aa22a9fac6f32e'
+
+DESCRIPTION='Description: commandline package manager
+ This APT has Super Cow Powers.'
+
+TRANSDESCRIPTION='Description-en: commandline package manager
+ This APT has translated Super Cow Powers.'
+
+echo "Package: apt-normal
+$PACKAGESTANZA
+$DESCRIPTION
+Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+Package: apt-both-below
+$PACKAGESTANZA
+$DESCRIPTION
+$TRANSDESCRIPTION
+Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+
+Package: apt-both-middle
+$PACKAGESTANZA
+$DESCRIPTION
+Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+$TRANSDESCRIPTION
+
+Package: apt-both-top
+$PACKAGESTANZA
+Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+$DESCRIPTION
+$TRANSDESCRIPTION
+
+Package: apt-trans
+$PACKAGESTANZA
+$TRANSDESCRIPTION
+Description-md5: cccccccccccccccccccccccccccccccc
+
+Package: apt-md5
+$PACKAGESTANZA
+Description-md5: dddddddddddddddddddddddddddddddd
+
+Package: apt-none
+$PACKAGESTANZA" > aptarchive/Packages
+
+setupaptarchive
+
+testequal "Package: apt-normal
+$PACKAGESTANZA
+$DESCRIPTION
+Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+" aptcache show apt-normal
+
+# displaying the translated Description would be equally valid,
+# but we assume only one description is in a Packages file and
+# so we prefer "Description" over "Description-*" currently.
+for variant in 'below' 'middle' 'top'; do
+	testequal "Package: apt-both-$variant
+$PACKAGESTANZA
+$DESCRIPTION
+Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+" aptcache show apt-both-$variant
+done
+
+testequal "Package: apt-trans
+$PACKAGESTANZA
+$TRANSDESCRIPTION
+Description-md5: cccccccccccccccccccccccccccccccc
+" aptcache show apt-trans
+
+testequal "Package: apt-md5
+$PACKAGESTANZA
+Description-md5: dddddddddddddddddddddddddddddddd
+" aptcache show apt-md5
+
+testequal "Package: apt-none
+$PACKAGESTANZA
+" aptcache show apt-none
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index bd68fccf6..6764fefff 100755
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -12,7 +12,7 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0'
 setupaptarchive
 
 changetowebserver
-ARCHIVE='http://localhost/'
+ARCHIVE='http://localhost:8080/'
 msgtest 'Initial apt-get update should work with' 'InRelease'
 aptget update -qq && msgpass || msgfail
 
@@ -37,7 +37,7 @@ sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/  /
 
 # we append the (evil unsigned) Release file to the (good signed) InRelease
 cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease
-
+touch -d '+1hour' aptarchive/dists/stable/InRelease
 
 # ensure the update fails
 # useful for debugging to add "-o Debug::pkgAcquire::auth=true"
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 29301d07d..e45326970 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -35,7 +35,7 @@ SHA1-History:
 SHA1-Patches:
  7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28
  $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX
-generatereleasefiles
+generatereleasefiles '+1hour'
 signreleasefiles
 find aptarchive -name 'Packages*' -type f -delete
 aptget update -qq
diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers
new file mode 100755
index 000000000..64b901dd0
--- /dev/null
+++ b/test/integration/test-prefer-higher-priority-providers
@@ -0,0 +1,106 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'native'
+
+insertpackage 'unstable' 'foo' 'all' '1' 'Provides: stuff' 'important'
+insertpackage 'unstable' 'bar' 'all' '1' 'Provides: stuff' 'optional'
+insertpackage 'unstable' 'baz' 'all' '1' 'Provides: stuff' 'extra'
+insertpackage 'unstable' 'awesome' 'all' '1' 'Depends: stuff'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  foo
+The following NEW packages will be installed:
+  awesome foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Inst awesome (1 unstable [all])
+Conf foo (1 unstable [all])
+Conf awesome (1 unstable [all])' aptget install awesome -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  awesome foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Inst awesome (1 unstable [all])
+Conf foo (1 unstable [all])
+Conf awesome (1 unstable [all])' aptget install awesome foo -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'bar' is not installed, so not removed
+Package 'baz' is not installed, so not removed
+The following extra packages will be installed:
+  foo
+The following NEW packages will be installed:
+  awesome foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Inst awesome (1 unstable [all])
+Conf foo (1 unstable [all])
+Conf awesome (1 unstable [all])" aptget install awesome bar- baz- -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'foo' is not installed, so not removed
+The following extra packages will be installed:
+  bar
+The following NEW packages will be installed:
+  awesome bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1 unstable [all])
+Inst awesome (1 unstable [all])
+Conf bar (1 unstable [all])
+Conf awesome (1 unstable [all])" aptget install awesome foo- -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'foo' is not installed, so not removed
+Package 'baz' is not installed, so not removed
+The following extra packages will be installed:
+  bar
+The following NEW packages will be installed:
+  awesome bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1 unstable [all])
+Inst awesome (1 unstable [all])
+Conf bar (1 unstable [all])
+Conf awesome (1 unstable [all])" aptget install awesome foo- baz- -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'foo' is not installed, so not removed
+Package 'bar' is not installed, so not removed
+The following extra packages will be installed:
+  baz
+The following NEW packages will be installed:
+  awesome baz
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst baz (1 unstable [all])
+Inst awesome (1 unstable [all])
+Conf baz (1 unstable [all])
+Conf awesome (1 unstable [all])" aptget install awesome foo- bar- -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'foo' is not installed, so not removed
+Package 'bar' is not installed, so not removed
+Package 'baz' is not installed, so not removed
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ awesome : Depends: stuff
+E: Unable to correct problems, you have held broken packages." aptget install awesome foo- bar- baz- -s
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 01fb2e529..e56f458d3 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -37,7 +37,7 @@ The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 After this operation, 5370 kB of additional disk space will be used.
-Get:1 http://localhost/  apt 0.7.25.3
+Get:1 http://localhost:8080/  apt 0.7.25.3
 Download complete and in download only mode' aptget install apt -dy
 }
 
@@ -50,7 +50,7 @@ The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 After this operation, 5808 kB of additional disk space will be used.
-Get:1 http://localhost/  apt 0.8.0~pre1
+Get:1 http://localhost:8080/  apt 0.8.0~pre1
 Download complete and in download only mode' aptget install apt -dy
 }
 
@@ -184,5 +184,5 @@ runtest2
 
 DELETEFILE="InRelease"
 runtest
-#DELETEFILE="Release.gpg"
-#runtest
+DELETEFILE="Release.gpg"
+runtest
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
index 25cccf067..1576c396c 100755
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -1,23 +1,6 @@
 #!/bin/sh
 set -e
 
-ensure_n_canary_strings_in_dir() {
-    DIR=$1
-    CANARY_STRING=$2
-    EXPECTED_N=$3
-
-    msgtest "Testing for $EXPECTED_N canary strings '$CANARY_STRING' in in" "$DIR"
-
-    N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l )
-    if [ "$N" = "$EXPECTED_N" ]; then
-        msgpass
-        return 0
-    else
-        msgfail "Expected $EXPECTED_N canaries, got $N"
-        return 1
-    fi
-}
-
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
@@ -25,23 +8,57 @@ setupenvironment
 configarchitecture 'native'
 
 insertpackage 'unstable' 'unrelated' 'all' '1.0' 'stable'
+insertsource 'unstable' 'unrelated' 'all' '1.0' 'stable'
+
+echo 'ni ni ni' > aptarchive/knights
 
 setupaptarchive
-changetowebserver --simulate-paywall
+changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
+
+msgtest 'Acquire test file from the webserver to check' 'overwrite'
+echo '601 Configuration
+Config-Item: Acquire::http::DependOnSTDIN=0
+
+600 Acquire URI
+URI: http://localhost:8080/holygrail
+Filename: knights-talking
+' | http >/dev/null 2>&1 && msgpass || msgfail
+testfileequal knights-talking 'ni ni ni'
+
+ensure_n_canary_strings_in_dir() {
+	local DIR="$1"
+	local CANARY_STRING="$2"
+	local EXPECTED_N="$3"
+
+	msgtest "Testing in $DIR for $EXPECTED_N canary" "$CANARY_STRING"
+	local N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l )
+	test "$N" = "$EXPECTED_N" && msgpass || msgfail "Expected $EXPECTED_N canaries, got $N"
+}
 
+LISTS='rootdir/var/lib/apt/lists'
 rm -rf rootdir/var/lib/apt/lists
-msgtest 'excpected failure of' 'apt-get update'
-aptget update -qq 2>/dev/null && msgfail || msgpass
+msgtest 'Got expected NODATA failure in' 'apt-get update'
+aptget update -qq 2>&1 | grep -q 'E: GPG error.*NODATA' && msgpass || msgfail
 
-ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ 'ni ni ni' 0
-testequal 'partial' ls rootdir/var/lib/apt/lists/
+ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
+testequal 'partial' ls $LISTS
 
-# again, this time with pre-existing files valid data
-for f in Release Release.gpg main_binary-amd64_Packages stable_main_source_Sources; do
-    echo "canary" > rootdir/var/lib/apt/lists/localhost:8080_dists_stable_${f}
+# and again with pre-existing files with "valid data" which should remain
+for f in Release Release.gpg main_binary-amd64_Packages main_source_Sources; do
+    echo 'peng neee-wom' > $LISTS/localhost:8080_dists_stable_${f}
 done
 
-# this will fail, the important part is that the canaries remain
+msgtest 'Got expected NODATA failure in' 'apt-get update'
+aptget update -qq 2>&1 | grep -q 'E: GPG error.*NODATA' && msgpass || msgfail
+
+ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 4
+ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
+
+# and now with a pre-existing InRelease file
+echo 'peng neee-wom' > $LISTS/localhost:8080_dists_stable_InRelease
+rm -f $LISTS/localhost:8080_dists_stable_Release $LISTS/localhost:8080_dists_stable_Release.gpg
 msgtest 'excpected failure of' 'apt-get update'
-aptget update -qq 2>/dev/null && msgfail || msgpass
-ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ 'canary' 4
+aptget update -qq 2>&1 | grep -q 'E: GPG error.*NODATA' && msgpass || msgfail
+
+ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 3
+ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
new file mode 100755
index 000000000..7f3b05e59
--- /dev/null
+++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
@@ -0,0 +1,46 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+# the difference between version 3 and 4 is the new package 'ure' which
+# we have to unpack before we start configuring parts of the loop
+insertinstalledpackage 'libreoffice' 'amd64' '3' 'Depends: libreoffice-core (= 3)'
+insertinstalledpackage 'libreoffice-core' 'amd64' '3' 'Depends: libreoffice-common (>= 3)'
+insertinstalledpackage 'libreoffice-common' 'all' '3' 'Depends: libreoffice-style
+Breaks: libreoffice-core (>= 3+), libreoffice-core (<= 3~), libreoffice-style-galaxy (>= 3+), libreoffice-style-galaxy (<= 3~)'
+insertinstalledpackage 'libreoffice-style-galaxy' 'amd64' '3' 'Depends: libreoffice-core
+Provides: libreoffice-style'
+
+buildsimplenativepackage 'libreoffice' 'amd64' '4' 'sid' 'Depends: libreoffice-core (= 4)'
+buildsimplenativepackage 'libreoffice-core' 'amd64' '4' 'sid' 'Depends: libreoffice-common (>= 4)
+Breaks: libreoffice-common (<< 4), libreoffice-style-galaxy (<< 4)'
+buildsimplenativepackage 'libreoffice-common' 'all' '4' 'sid' 'Depends: libreoffice-style, ure
+Breaks: libreoffice-core (>= 4+), libreoffice-core (<= 4~), libreoffice-style-galaxy (>= 4+), libreoffice-style-galaxy (<= 4~)'
+buildsimplenativepackage 'libreoffice-style-galaxy' 'amd64' '4' 'sid' 'Depends: libreoffice-core
+Provides: libreoffice-style'
+
+buildsimplenativepackage 'ure' 'amd64' '4' 'sid'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  ure
+The following packages will be upgraded:
+  libreoffice libreoffice-common libreoffice-core libreoffice-style-galaxy
+4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst libreoffice [3] (4 sid [amd64]) []
+Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ]
+Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ]
+Inst libreoffice-common [3] (4 sid [all]) []
+Inst ure (4 sid [amd64])
+Conf ure (4 sid [amd64])
+Conf libreoffice-style-galaxy (4 sid [amd64])
+Conf libreoffice-common (4 sid [all])
+Conf libreoffice-core (4 sid [amd64])
+Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index ff60d64a3..dc17d4991 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -23,8 +23,10 @@
 #include <dirent.h>
 #include <signal.h>
 
-char const * const httpcodeToStr(int const httpcode) {			/*{{{*/
-   switch (httpcode) {
+char const * const httpcodeToStr(int const httpcode)			/*{{{*/
+{
+   switch (httpcode)
+   {
       // Informational 1xx
       case 100: return "100 Continue";
       case 101: return "101 Switching Protocols";
@@ -63,6 +65,7 @@ char const * const httpcodeToStr(int const httpcode) {			/*{{{*/
       case 415: return "415 Unsupported Media Type";
       case 416: return "416 Requested range not satisfiable";
       case 417: return "417 Expectation Failed";
+      case 418: return "418 I'm a teapot";
       // Server error 5xx
       case 500: return "500 Internal Server Error";
       case 501: return "501 Not Implemented";
@@ -74,7 +77,8 @@ char const * const httpcodeToStr(int const httpcode) {			/*{{{*/
    return NULL;
 }
 									/*}}}*/
-void addFileHeaders(std::list<std::string> &headers, FileFd &data) {	/*{{{*/
+void addFileHeaders(std::list<std::string> &headers, FileFd &data)	/*{{{*/
+{
    std::ostringstream contentlength;
    contentlength << "Content-Length: " << data.FileSize();
    headers.push_back(contentlength.str());
@@ -82,27 +86,17 @@ void addFileHeaders(std::list<std::string> &headers, FileFd &data) {	/*{{{*/
    std::string lastmodified("Last-Modified: ");
    lastmodified.append(TimeRFC1123(data.ModificationTime()));
    headers.push_back(lastmodified);
-
-   std::string const fileext = flExtension(data.Name());
-   if (fileext.empty() == false && fileext != data.Name()) {
-      std::string confcontenttype("aptwebserver::ContentType::");
-      confcontenttype.append(fileext);
-      std::string const contenttype = _config->Find(confcontenttype);
-      if (contenttype.empty() == false) {
-	 std::string header("Content-Type: ");
-	 header.append(contenttype);
-	 headers.push_back(header);
-      }
-   }
 }
 									/*}}}*/
-void addDataHeaders(std::list<std::string> &headers, std::string &data) {/*{{{*/
+void addDataHeaders(std::list<std::string> &headers, std::string &data)	/*{{{*/
+{
    std::ostringstream contentlength;
    contentlength << "Content-Length: " << data.size();
    headers.push_back(contentlength.str());
 }
 									/*}}}*/
-bool sendHead(int const client, int const httpcode, std::list<std::string> &headers) { /*{{{*/
+bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/
+{
    std::string response("HTTP/1.1 ");
    response.append(httpcodeToStr(httpcode));
    headers.push_front(response);
@@ -113,12 +107,11 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head
    date.append(TimeRFC1123(time(NULL)));
    headers.push_back(date);
 
-   headers.push_back("Accept-Ranges: bytes");
-
    std::clog << ">>> RESPONSE >>>" << std::endl;
    bool Success = true;
    for (std::list<std::string>::const_iterator h = headers.begin();
-	Success == true && h != headers.end(); ++h) {
+	Success == true && h != headers.end(); ++h)
+   {
       Success &= FileFd::Write(client, h->c_str(), h->size());
       if (Success == true)
 	 Success &= FileFd::Write(client, "\r\n", 2);
@@ -130,11 +123,13 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head
    return Success;
 }
 									/*}}}*/
-bool sendFile(int const client, FileFd &data) {				/*{{{*/
+bool sendFile(int const client, FileFd &data)				/*{{{*/
+{
    bool Success = true;
    char buffer[500];
    unsigned long long actual = 0;
-   while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true) {
+   while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true)
+   {
       if (actual == 0)
 	 break;
       if (Success == true)
@@ -145,7 +140,8 @@ bool sendFile(int const client, FileFd &data) {				/*{{{*/
    return Success;
 }
 									/*}}}*/
-bool sendData(int const client, std::string const &data) {		/*{{{*/
+bool sendData(int const client, std::string const &data)		/*{{{*/
+{
    bool Success = true;
    Success &= FileFd::Write(client, data.c_str(), data.size());
    if (Success == true)
@@ -153,7 +149,9 @@ bool sendData(int const client, std::string const &data) {		/*{{{*/
    return Success;
 }
 									/*}}}*/
-void sendError(int const client, int const httpcode, std::string const &request, bool content, std::string const &error = "") { /*{{{*/
+void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
+	       bool content, std::string const &error = "")
+{
    std::list<std::string> headers;
    std::string response("<html><head><title>");
    response.append(httpcodeToStr(httpcode)).append("</title></head>");
@@ -168,7 +166,9 @@ void sendError(int const client, int const httpcode, std::string const &request,
       sendData(client, response);
 }
 									/*}}}*/
-void sendRedirect(int const client, int const httpcode, std::string const &uri, std::string const &request, bool content) { /*{{{*/
+void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/
+		  std::string const &request, bool content)
+{
    std::list<std::string> headers;
    std::string response("<html><head><title>");
    response.append(httpcodeToStr(httpcode)).append("</title></head>");
@@ -188,8 +188,8 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,
       sendData(client, response);
 }
 									/*}}}*/
-// sendDirectoryLisiting						/*{{{*/
-int filter_hidden_files(const struct dirent *a) {
+int filter_hidden_files(const struct dirent *a)				/*{{{*/
+{
    if (a->d_name[0] == '.')
       return 0;
 #ifdef _DIRENT_HAVE_D_TYPE
@@ -225,13 +225,17 @@ int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
    }
    return strcasecmp((*a)->d_name, (*b)->d_name);
 }
-void sendDirectoryListing(int const client, std::string const &dir, std::string const &request, bool content) {
+									/*}}}*/
+void sendDirectoryListing(int const client, std::string const &dir,	/*{{{*/
+			  std::string const &request, bool content)
+{
    std::list<std::string> headers;
    std::ostringstream listing;
 
    struct dirent **namelist;
    int const counter = scandir(dir.c_str(), &namelist, filter_hidden_files, grouped_alpha_case_sort);
-   if (counter == -1) {
+   if (counter == -1)
+   {
       sendError(client, 500, request, content);
       return;
    }
@@ -251,11 +255,14 @@ void sendDirectoryListing(int const client, std::string const &dir, std::string
       std::string filename(dir);
       filename.append("/").append(namelist[i]->d_name);
       stat(filename.c_str(), &fs);
-      if (S_ISDIR(fs.st_mode)) {
+      if (S_ISDIR(fs.st_mode))
+      {
 	 listing << "<tr><td>d</td>"
 		 << "<td><a href=\"" << namelist[i]->d_name << "/\">" << namelist[i]->d_name << "</a></td>"
 		 << "<td>-</td>";
-      } else {
+      }
+      else
+      {
 	 listing << "<tr><td>f</td>"
 		 << "<td><a href=\"" << namelist[i]->d_name << "\">" << namelist[i]->d_name << "</a></td>"
 		 << "<td>" << SizeToStr(fs.st_size) << "B</td>";
@@ -271,7 +278,10 @@ void sendDirectoryListing(int const client, std::string const &dir, std::string
       sendData(client, response);
 }
 									/*}}}*/
-bool parseFirstLine(int const client, std::string const &request, std::string &filename, bool &sendContent, bool &closeConnection) { /*{{{*/
+bool parseFirstLine(int const client, std::string const &request,	/*{{{*/
+		    std::string &filename, bool &sendContent,
+		    bool &closeConnection)
+{
    if (strncmp(request.c_str(), "HEAD ", 5) == 0)
       sendContent = false;
    if (strncmp(request.c_str(), "GET ", 4) != 0)
@@ -285,7 +295,8 @@ bool parseFirstLine(int const client, std::string const &request, std::string &f
    for (; request[filestart] == ' '; ++filestart);
    size_t fileend = request.rfind(' ', lineend);
    if (lineend == std::string::npos || filestart == std::string::npos ||
-	 fileend == std::string::npos || filestart == fileend) {
+	 fileend == std::string::npos || filestart == fileend)
+   {
       sendError(client, 500, request, sendContent, "Filename can't be extracted");
       return false;
    }
@@ -296,13 +307,15 @@ bool parseFirstLine(int const client, std::string const &request, std::string &f
       closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "Keep-Alive") != 0;
    else if (strncmp(request.c_str() + httpstart, "HTTP/1.0\r", 9) == 0)
       closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0;
-   else {
-      sendError(client, 500, request, sendContent, "Not an HTTP/1.{0,1} request");
+   else
+   {
+      sendError(client, 500, request, sendContent, "Not a HTTP/1.{0,1} request");
       return false;
    }
 
    filename = request.substr(filestart, fileend - filestart);
-   if (filename.find(' ') != std::string::npos) {
+   if (filename.find(' ') != std::string::npos)
+   {
       sendError(client, 500, request, sendContent, "Filename contains an unencoded space");
       return false;
    }
@@ -312,7 +325,8 @@ bool parseFirstLine(int const client, std::string const &request, std::string &f
    if (filename.empty() == true || filename[0] != '/' ||
        strncmp(filename.c_str(), "//", 2) == 0 ||
        filename.find_first_of("\r\n\t\f\v") != std::string::npos ||
-       filename.find("/../") != std::string::npos) {
+       filename.find("/../") != std::string::npos)
+   {
       sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)");
       return false;
    }
@@ -336,7 +350,8 @@ int main(int const argc, const char * argv[])
    };
 
    CommandLine CmdL(Args, _config);
-   if(CmdL.Parse(argc,argv) == false) {
+   if(CmdL.Parse(argc,argv) == false)
+   {
       _error->DumpErrors();
       exit(1);
    }
@@ -345,7 +360,8 @@ int main(int const argc, const char * argv[])
    // ignore SIGPIPE, this can happen on write() if the socket closes connection
    signal(SIGPIPE, SIG_IGN);
    int sock = socket(AF_INET6, SOCK_STREAM, 0);
-   if(sock < 0 ) {
+   if(sock < 0)
+   {
       _error->Errno("aptwerbserver", "Couldn't create socket");
       _error->DumpErrors(std::cerr);
       return 1;
@@ -358,7 +374,7 @@ int main(int const argc, const char * argv[])
    // ensure that we accept all connections: v4 or v6
    int const iponly = 0;
    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &iponly, sizeof(iponly));
-   // to not linger to an address
+   // to not linger on an address
    int const enable = 1;
    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
 
@@ -368,29 +384,66 @@ int main(int const argc, const char * argv[])
    locAddr.sin6_port = htons(port);
    locAddr.sin6_addr = in6addr_any;
 
-   if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) {
+   if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0)
+   {
       _error->Errno("aptwerbserver", "Couldn't bind");
       _error->DumpErrors(std::cerr);
       return 2;
    }
 
+   FileFd pidfile;
+   if (_config->FindB("aptwebserver::fork", false) == true)
+   {
+      std::string const pidfilename = _config->Find("aptwebserver::pidfile", "aptwebserver.pid");
+      int const pidfilefd = GetLock(pidfilename);
+      if (pidfilefd < 0 || pidfile.OpenDescriptor(pidfilefd, FileFd::WriteOnly) == false)
+      {
+	 _error->Errno("aptwebserver", "Couldn't acquire lock on pidfile '%s'", pidfilename.c_str());
+	 _error->DumpErrors(std::cerr);
+	 return 3;
+      }
+
+      pid_t child = fork();
+      if (child < 0)
+      {
+	 _error->Errno("aptwebserver", "Forking failed");
+	 _error->DumpErrors(std::cerr);
+	 return 4;
+      }
+      else if (child != 0)
+      {
+	 // successfully forked: ready to serve!
+	 std::string pidcontent;
+	 strprintf(pidcontent, "%d", child);
+	 pidfile.Write(pidcontent.c_str(), pidcontent.size());
+	 if (_error->PendingError() == true)
+	 {
+	    _error->DumpErrors(std::cerr);
+	    return 5;
+	 }
+	 std::cout << "Successfully forked as " << child << std::endl;
+	 return 0;
+      }
+   }
+
    if (simulate_broken_server) {
       std::clog << "Simulating a broken web server that return nonsense "
                    "for all querries" << std::endl;
    } else {
       std::clog << "Serving ANY file on port: " << port << std::endl;
    }
-
    listen(sock, 1);
    /*}}}*/
 
    std::vector<std::string> messages;
    int client;
-   while ((client = accept(sock, NULL, NULL)) != -1) {
+   while ((client = accept(sock, NULL, NULL)) != -1)
+   {
       std::clog << "ACCEPT client " << client
 		<< " on socket " << sock << std::endl;
 
-      while (ReadMessages(client, messages)) {
+      while (ReadMessages(client, messages))
+      {
 	 bool closeConnection = false;
 	 for (std::vector<std::string>::const_iterator m = messages.begin();
 	      m != messages.end() && closeConnection == false; ++m) {
@@ -403,7 +456,8 @@ int main(int const argc, const char * argv[])
 	       continue;
 
 	    std::string host = LookupTag(*m, "Host", "");
-	    if (host.empty() == true) {
+	    if (host.empty() == true)
+	    {
 	       // RFC 2616 ยง14.23 requires Host
 	       sendError(client, 400, *m, sendContent, "Host header is required");
 	       continue;
@@ -414,90 +468,80 @@ int main(int const argc, const char * argv[])
 	       addDataHeaders(headers, data);
 	       sendHead(client, 200, headers);
 	       sendData(client, data);
+               continue;
 	    }
-	    else if (RealFileExists(filename) == true) {
+
+	    // string replacements in the requested filename
+	    ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace");
+	    if (Replaces != NULL)
+	    {
+	       std::string redirect = "/" + filename;
+	       for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next)
+		  redirect = SubstVar(redirect, I->Tag, I->Value);
+	       redirect.erase(0,1);
+	       if (redirect != filename)
+	       {
+		  sendRedirect(client, 301, redirect, *m, sendContent);
+		  continue;
+	       }
+	    }
+
+	    ::Configuration::Item const *Overwrite = _config->Tree("aptwebserver::overwrite");
+	    if (Overwrite != NULL)
+	    {
+	       for (::Configuration::Item *I = Overwrite->Child; I != NULL; I = I->Next)
+	       {
+		  regex_t *pattern = new regex_t;
+		  int const res = regcomp(pattern, I->Tag.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB);
+		  if (res != 0)
+		  {
+		     char error[300];
+		     regerror(res, pattern, error, sizeof(error));
+		     sendError(client, 500, *m, sendContent, error);
+		     continue;
+		  }
+		  if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0)
+		  {
+		      filename = _config->Find("aptwebserver::overwrite::" + I->Tag + "::filename", filename);
+		      if (filename[0] == '/')
+			 filename.erase(0,1);
+		      regfree(pattern);
+		      break;
+		  }
+		  regfree(pattern);
+	       }
+	    }
+
+	    // deal with the request
+	    if (RealFileExists(filename) == true)
+	    {
 	       FileFd data(filename, FileFd::ReadOnly);
 	       std::string condition = LookupTag(*m, "If-Modified-Since", "");
-	       if (condition.empty() == false) {
+	       if (condition.empty() == false)
+	       {
 		  time_t cache;
 		  if (RFC1123StrToTime(condition.c_str(), cache) == true &&
-		      cache >= data.ModificationTime()) {
+			cache >= data.ModificationTime())
+		  {
 		     sendHead(client, 304, headers);
 		     continue;
 		  }
 	       }
-	       condition = LookupTag(*m, "If-Range", "");
-	       bool ignoreRange = false;
-	       if (condition.empty() == false) {
-		  time_t cache;
-		  if (RFC1123StrToTime(condition.c_str(), cache) == false ||
-		      cache < data.ModificationTime())
-		     ignoreRange = true;
-	       }
-	       condition = LookupTag(*m, "Range", "");
-	       if (ignoreRange == false && condition.empty() == false &&
-		   strncmp(condition.c_str(), "bytes=", 6) == 0) {
-		  size_t end = condition.find(',');
-		  // FIXME: support multiple byte-ranges
-		  if (end == std::string::npos) {
-		     size_t start = 6;
-		     unsigned long long filestart = strtoull(condition.c_str() + start, NULL, 10);
-		     // FIXME: no fileend support
-		     size_t dash = condition.find('-') + 1;
-		     unsigned long long fileend = strtoull(condition.c_str() + dash, NULL, 10);
-		     unsigned long long filesize = data.FileSize();
-		     if (fileend == 0 || fileend == filesize) {
-			if (filesize > filestart) {
-			   data.Skip(filestart);
-			   std::ostringstream contentlength;
-			   contentlength << "Content-Length: " << (filesize - filestart);
-			   headers.push_back(contentlength.str());
-			   std::ostringstream contentrange;
-			   contentrange << "Content-Range: bytes " << filestart << "-"
-					<< filesize - 1 << "/" << filesize;
-			   headers.push_back(contentrange.str());
-			   sendHead(client, 206, headers);
-			   if (sendContent == true)
-			      sendFile(client, data);
-			   continue;
-			} else {
-			   headers.push_back("Content-Length: 0");
-			   std::ostringstream contentrange;
-			   contentrange << "Content-Range: bytes 0-0/" << filesize;
-			   headers.push_back(contentrange.str());
-			   sendHead(client, 416, headers);
-			   continue;
-			}
-		     }
-		  }
-	       }
 
 	       addFileHeaders(headers, data);
 	       sendHead(client, 200, headers);
 	       if (sendContent == true)
 		  sendFile(client, data);
 	    }
-	    else if (DirectoryExists(filename) == true) {
+	    else if (DirectoryExists(filename) == true)
+	    {
 	       if (filename == "." || filename[filename.length()-1] == '/')
 		  sendDirectoryListing(client, filename, *m, sendContent);
 	       else
 		  sendRedirect(client, 301, filename.append("/"), *m, sendContent);
 	    }
 	    else
-	    {
-	       ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace");
-	       if (Replaces != NULL) {
-		  std::string redirect = "/" + filename;
-		  for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next)
-		     redirect = SubstVar(redirect, I->Tag, I->Value);
-		  redirect.erase(0,1);
-		  if (redirect != filename) {
-		     sendRedirect(client, 301, redirect, *m, sendContent);
-		     continue;
-		  }
-	       }
 	       sendError(client, 404, *m, sendContent);
-	    }
 	 }
 	 _error->DumpErrors(std::cerr);
 	 messages.clear();
@@ -509,5 +553,7 @@ int main(int const argc, const char * argv[])
 		<< " on socket " << sock << std::endl;
       close(client);
    }
+   pidfile.Close();
+
    return 0;
 }
diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile
index fee94cd77..74659cf12 100644
--- a/test/interactive-helper/makefile
+++ b/test/interactive-helper/makefile
@@ -1,6 +1,7 @@
 # -*- make -*-
 BASE=../..
 SUBDIR=test/interactive-helper
+APT_DOMAIN=none
 
 # Bring in the default rules
 include ../../buildlib/defaults.mak
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 953e455e0..1b67cba9d 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -2,6 +2,7 @@
 BASE=../..
 SUBDIR=test/libapt
 BASENAME=_libapt_test
+APT_DOMAIN=none
 
 # Bring in the default rules
 include ../../buildlib/defaults.mak
diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc
index 99bb3067e..8216ade71 100644
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -108,5 +108,13 @@ int main() {
 	equals("/debian/", U.Path);
 	}
 
+        // Percent-encoding.
+        {
+        URI U("ftp://foo:b%40r@example.org");
+        equals("foo", U.User);
+        equals("b@r", U.Password);
+        equals("ftp://foo:b%40r@example.org/", (std::string) U);
+        }
+
 	return 0;
 }